about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorJoshua Nelson <jnelson@cloudflare.com>2022-07-23 15:37:46 -0500
committerAmos Wenger <amoswenger@gmail.com>2022-07-24 10:38:42 +0200
commitee09dc5510a775963183d4bde9c36dce2a6863ce (patch)
tree3bb7e2d575a7a189b5741899d1625a905503c8f9 /src/tools
parente0add21c2bdd89a507771fc344927ef85a816c50 (diff)
downloadrust-ee09dc5510a775963183d4bde9c36dce2a6863ce.tar.gz
rust-ee09dc5510a775963183d4bde9c36dce2a6863ce.zip
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.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/rust-analyzer/crates/proc-macro-test/build.rs10
1 files changed, 6 insertions, 4 deletions
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 cd99eea5ae3..c90144509de 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 ============");