From e69d57f16fa229c71cff164ecbf84a144fa927f0 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Fri, 30 Aug 2024 16:15:01 +0200
Subject: [PATCH] Revert "fix: do not assume rustup is installed in xtask
 codegen"

This reverts commit 7d9e4fcc07e5de94e37b73436147cdbbaa35dbdc.
---
 src/tools/rust-analyzer/xtask/src/codegen.rs | 34 +++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/tools/rust-analyzer/xtask/src/codegen.rs b/src/tools/rust-analyzer/xtask/src/codegen.rs
index 09bfed19b0e97..aeb0c00ae6aad 100644
--- a/src/tools/rust-analyzer/xtask/src/codegen.rs
+++ b/src/tools/rust-analyzer/xtask/src/codegen.rs
@@ -126,31 +126,27 @@ impl fmt::Display for Location {
     }
 }
 
-fn rustfmt_executable(sh: &Shell) -> &str {
-    // First try explicitly requesting the stable channel via rustup in case nightly is being used by default,
-    // then plain rustfmt in case rustup isn't being used to manage the compiler (e.g. when using Nix).
-    for executable in ["rustup run stable rustfmt", "rustfmt"] {
-        let version = cmd!(sh, "{executable} --version").read().unwrap_or_default();
-        if version.contains("stable") {
-            return executable;
-        }
-    }
-
-    panic!(
-        "Failed to run rustfmt from toolchain 'stable'. \
+fn ensure_rustfmt(sh: &Shell) {
+    let version = cmd!(sh, "rustup run stable rustfmt --version").read().unwrap_or_default();
+    if !version.contains("stable") {
+        panic!(
+            "Failed to run rustfmt from toolchain 'stable'. \
                  Please run `rustup component add rustfmt --toolchain stable` to install it.",
-    );
+        );
+    }
 }
 
 fn reformat(text: String) -> String {
     let sh = Shell::new().unwrap();
-    let rustfmt_exe = rustfmt_executable(&sh);
+    ensure_rustfmt(&sh);
     let rustfmt_toml = project_root().join("rustfmt.toml");
-    let mut stdout =
-        cmd!(sh, "{rustfmt_exe} --config-path {rustfmt_toml} --config fn_single_line=true")
-            .stdin(text)
-            .read()
-            .unwrap();
+    let mut stdout = cmd!(
+        sh,
+        "rustup run stable rustfmt --config-path {rustfmt_toml} --config fn_single_line=true"
+    )
+    .stdin(text)
+    .read()
+    .unwrap();
     if !stdout.ends_with('\n') {
         stdout.push('\n');
     }