diff options
| author | Joshua Nelson <jnelson@cloudflare.com> | 2022-07-23 15:37:46 -0500 |
|---|---|---|
| committer | Amos Wenger <amoswenger@gmail.com> | 2022-07-24 10:38:42 +0200 |
| commit | 20eb2ddb2ed6eee92f2ca29e7f2767fe37ab779d (patch) | |
| tree | fdfdb5b9492f92b2d75dcced1fa74dc4f02ced21 | |
| parent | b351e115d68e0da23070767551b7155cbd4fbe7c (diff) | |
| download | rust-20eb2ddb2ed6eee92f2ca29e7f2767fe37ab779d.tar.gz rust-20eb2ddb2ed6eee92f2ca29e7f2767fe37ab779d.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.
| -rw-r--r-- | crates/proc-macro-test/build.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crates/proc-macro-test/build.rs b/crates/proc-macro-test/build.rs index cd99eea5ae3..c90144509de 100644 --- a/crates/proc-macro-test/build.rs +++ b/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 ============"); |
