mirrors/cargo-expand
1
0
Fork 0
mirror of https://github.com/dtolnay/cargo-expand.git synced 2025-04-03 12:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #213 from dtolnay/wrapper

Browse source 
Apply RUSTC_WRAPPER and RUSTC_WORKSPACE_WRAPPER
This commit is contained in:
David Tolnay 2024-03-29 13:00:29 -07:00 • committed by GitHub
commit 5a7f8b09d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main.rs
View file

@ -39,6 +39,7 @@ use std::env;
use std::error::Error as StdError;
use std::ffi::OsString;
use std::io::{self, BufRead, IsTerminal, Write};
use std::iter;
use std::panic::{self, PanicInfo, UnwindSafe};
use std::path::{Path, PathBuf};
use std::process::{self, Command, Stdio};
@ -437,7 +438,16 @@ fn needs_rustc_bootstrap() -> bool {
sysroot.join("bin").join("rustc")
};
let mut cmd = Command::new(rustc);
let rustc_wrapper = env::var_os("RUSTC_WRAPPER").filter(|wrapper| !wrapper.is_empty());
let rustc_workspace_wrapper =
env::var_os("RUSTC_WORKSPACE_WRAPPER").filter(|wrapper| !wrapper.is_empty());
let mut wrapped_rustc = rustc_wrapper
.into_iter()
.chain(rustc_workspace_wrapper)
.chain(iter::once(rustc.into_os_string()));
let mut cmd = Command::new(wrapped_rustc.next().unwrap());
cmd.args(wrapped_rustc);
cmd.arg("-Zunpretty=expanded");
cmd.arg("-");
cmd.stdin(Stdio::null());