From ee09dc5510a775963183d4bde9c36dce2a6863ce Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jnelson@cloudflare.com>
Date: Sat, 23 Jul 2022 15:37:46 -0500
Subject: [PATCH] Small fixups

- use `path` instead of `paths`
- don't mark rust-analyzer as an optional tool
- print the cargo command that's run in the proc-macro-test build script

  this originally was part of a change to fix `test --stage 0 rust-analyzer`,
  but I'm going to leave that for a separate PR so it's easier to review.
---
 src/bootstrap/check.rs                                 |  2 +-
 src/bootstrap/tool.rs                                  |  2 +-
 .../rust-analyzer/crates/proc-macro-test/build.rs      | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index cfeb1c9d6075..394bd8b4e282 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -312,7 +312,7 @@ impl Step for RustAnalyzer {
     const DEFAULT: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.paths(&["src/tools/rust-analyzer"])
+        run.path("src/tools/rust-analyzer")
     }
 
     fn make_run(run: RunConfig<'_>) {
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 3d06ce022165..7c37621d417c 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -721,7 +721,7 @@ impl Step for RustAnalyzer {
             mode: Mode::ToolStd,
             path: "src/tools/rust-analyzer",
             extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()],
-            is_optional_tool: true,
+            is_optional_tool: false,
             source_type: SourceType::InTree,
         })
     }
diff --git a/src/tools/rust-analyzer/crates/proc-macro-test/build.rs b/src/tools/rust-analyzer/crates/proc-macro-test/build.rs
index cd99eea5ae3f..c90144509dec 100644
--- a/src/tools/rust-analyzer/crates/proc-macro-test/build.rs
+++ b/src/tools/rust-analyzer/crates/proc-macro-test/build.rs
@@ -62,7 +62,7 @@ fn main() {
         Command::new(toolchain::cargo())
     };
 
-    let output = cmd
+    cmd
         .current_dir(&staging_dir)
         .args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"])
         // Explicit override the target directory to avoid using the same one which the parent
@@ -70,9 +70,11 @@ fn main() {
         // This can happen when `CARGO_TARGET_DIR` is set or global config forces all cargo
         // instance to use the same target directory.
         .arg("--target-dir")
-        .arg(&target_dir)
-        .output()
-        .unwrap();
+        .arg(&target_dir);
+
+    println!("Running {:?}", cmd);
+
+    let output = cmd.output().unwrap();
     if !output.status.success() {
         println!("proc-macro-test-impl failed to build");
         println!("============ stdout ============");