nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 23:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixups

Browse Source 
- 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.
This commit is contained in:
Joshua Nelson 2022-07-23 15:37:46 -05:00 committed by Amos Wenger
parent b351e115d6
commit 20eb2ddb2e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/proc-macro-test/build.rs
View File

@ -62,7 +62,7 @@ fn main() {
Command::new(toolchain::cargo()) Command::new(toolchain::cargo())
}; };
let output = cmd cmd
.current_dir(&staging_dir) .current_dir(&staging_dir)
.args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"]) .args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"])
// Explicit override the target directory to avoid using the same one which the parent // 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 // This can happen when `CARGO_TARGET_DIR` is set or global config forces all cargo
// instance to use the same target directory. // instance to use the same target directory.
.arg("--target-dir") .arg("--target-dir")
.arg(&target_dir) .arg(&target_dir);
.output()
.unwrap(); println!("Running {:?}", cmd);
let output = cmd.output().unwrap();
if !output.status.success() { if !output.status.success() {
println!("proc-macro-test-impl failed to build"); println!("proc-macro-test-impl failed to build");
println!("============ stdout ============"); println!("============ stdout ============");