Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/cargo/ops/fix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,8 @@ pub fn fix_maybe_exec_rustc(config: &Config) -> CargoResult<bool> {
let workspace_rustc = std::env::var("RUSTC_WORKSPACE_WRAPPER")
.map(PathBuf::from)
.ok();
let rustc = ProcessBuilder::new(&args.rustc).wrapped(workspace_rustc.as_ref());
let mut rustc = ProcessBuilder::new(&args.rustc).wrapped(workspace_rustc.as_ref());
rustc.env_remove(FIX_ENV);

trace!("start rustfixing {:?}", args.file);
let fixes = rustfix_crate(&lock_addr, &rustc, &args.file, &args, config)?;
Expand Down
49 changes: 49 additions & 0 deletions tests/testsuite/fix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1684,3 +1684,52 @@ fn abnormal_exit() {
.with_stderr_contains("Original diagnostics will follow.")
.run();
}

#[cargo_test]
fn fix_with_run_cargo_in_proc_macros() {
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
edition = "2018"

[lib]
proc-macro = true
"#,
)
.file(
"src/lib.rs",
r#"
use proc_macro::*;

#[proc_macro]
pub fn foo(_input: TokenStream) -> TokenStream {
let output = std::process::Command::new("cargo")
.args(&["metadata", "--format-version=1"])
.output()
.unwrap();
eprintln!("{}", std::str::from_utf8(&output.stderr).unwrap());
println!("{}", std::str::from_utf8(&output.stdout).unwrap());
"".parse().unwrap()
}
"#,
)
.file(
"src/bin/main.rs",
r#"
use foo::foo;

fn main() {
foo!("bar")
}
"#,
)
.build();
p.cargo("fix --allow-no-vcs")
.masquerade_as_nightly_cargo()
.with_stderr_does_not_contain("error: could not find .rs file in rustc args")
.run();
}