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

Also use tmp file if pygmentize but no rustfmt

Browse source
This commit is contained in:
David Tolnay 2017-01-12 20:44:11 -08:00
parent fadf2344ce
commit d48a89a7d1
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/main.rs
View file

@ -36,7 +36,8 @@ fn cargo_expand() -> io::Result<i32> {
#[cfg(unix)] #[cfg(unix)]
fn cargo_expand() -> io::Result<i32> { fn cargo_expand() -> io::Result<i32> {
match env::args_os().last().unwrap().to_str().unwrap_or("") { let args: Vec<_> = env::args_os().collect();
match args.last().unwrap().to_str().unwrap_or("") {
"--filter-cargo" => filter_err(ignore_cargo_err), "--filter-cargo" => filter_err(ignore_cargo_err),
"--filter-rustfmt" => filter_err(ignore_rustfmt_err), "--filter-rustfmt" => filter_err(ignore_rustfmt_err),
_ => {} _ => {}
@ -49,20 +50,25 @@ fn cargo_expand() -> io::Result<i32> {
} }
let which_rustfmt = which(&["rustfmt"]); let which_rustfmt = which(&["rustfmt"]);
let outdir = match which_rustfmt { let which_pygmentize = if stdout_isatty() {
Some(_) => Some(TempDir::new("cargo-expand").expect("failed to create tmp file")), which(&["pygmentize", "-l", "rust"])
None => None, } else {
None
};
let outdir = if which_rustfmt.is_some() || which_pygmentize.is_some() {
Some(TempDir::new("cargo-expand").expect("failed to create tmp file"))
} else {
None
}; };
let outfile = outdir.as_ref().map(|dir| dir.path().join("expanded")); let outfile = outdir.as_ref().map(|dir| dir.path().join("expanded"));
// Build cargo command // Build cargo command
let mut cmd = Command::new("cargo"); let mut cmd = Command::new("cargo");
cmd.args(&wrap_args(env::args_os(), outfile.as_ref())); cmd.args(&wrap_args(args.clone(), outfile.as_ref()));
// Pipe to rustfmt // Pipe to a tmp file to separate out any println output from build scripts
let _wait = match which_rustfmt { if let Some(outfile) = outfile {
Some(ref fmt) => {
let args: Vec<_> = env::args_os().collect();
let mut filter_cargo = Vec::new(); let mut filter_cargo = Vec::new();
filter_cargo.extend(args.iter().map(OsString::as_os_str)); filter_cargo.extend(args.iter().map(OsString::as_os_str));
filter_cargo.push(OsStr::new("--filter-cargo")); filter_cargo.push(OsStr::new("--filter-cargo"));
@ -71,16 +77,21 @@ fn cargo_expand() -> io::Result<i32> {
try!(run(cmd)); try!(run(cmd));
drop(_wait); drop(_wait);
cmd = Command::new("sed"); cmd = Command::new("cat");
cmd.arg("s/$crate/XCRATE/g"); cmd.arg(outfile);
cmd.arg(outfile.unwrap()); }
// Pipe to rustfmt
let _wait = match which_rustfmt {
Some(ref fmt) => {
let args: Vec<_> = env::args_os().collect();
let mut filter_rustfmt = Vec::new(); let mut filter_rustfmt = Vec::new();
filter_rustfmt.extend(args.iter().map(OsString::as_os_str)); filter_rustfmt.extend(args.iter().map(OsString::as_os_str));
filter_rustfmt.push(OsStr::new("--filter-rustfmt")); filter_rustfmt.push(OsStr::new("--filter-rustfmt"));
Some(( Some((
// Work around $crate issue https://github.com/rust-lang/rust/issues/38016 // Work around $crate issue https://github.com/rust-lang/rust/issues/38016
try!(cmd.pipe_to(shell!("sed" "s/$crate/XCRATE/g"), None)),
try!(cmd.pipe_to(shell!(fmt), None)), try!(cmd.pipe_to(shell!(fmt), None)),
try!(cmd.pipe_to(shell!("sed" "s/XCRATE/$crate/g"), Some(&filter_rustfmt))), try!(cmd.pipe_to(shell!("sed" "s/XCRATE/$crate/g"), Some(&filter_rustfmt))),
)) ))
@ -89,13 +100,9 @@ fn cargo_expand() -> io::Result<i32> {
}; };
// Pipe to pygmentize // Pipe to pygmentize
let _wait = if stdout_isatty() { let _wait = match which_pygmentize {
match which(&["pygmentize", "-l", "rust"]) {
Some(pyg) => Some(try!(cmd.pipe_to(shell!(pyg "-l" "rust"), None))), Some(pyg) => Some(try!(cmd.pipe_to(shell!(pyg "-l" "rust"), None))),
None => None, None => None,
}
} else {
None
}; };
run(cmd) run(cmd)