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

Disable rustfmt and pygmentize if --help flag is passed

Browse source
This commit is contained in:
David Tolnay 2016-12-12 09:01:53 -08:00
parent e4538d7936
commit 6971da439a
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 26 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

75
src/main.rs
View file

@ -38,7 +38,7 @@ fn cargo_expand() -> io::Result<i32> {
cmd.args(&wrap_args(env::args())); cmd.args(&wrap_args(env::args()));
// Pipe to rustfmt // Pipe to rustfmt
let _wait = match which_rustfmt() { let _wait = match which(&["rustfmt"]) {
Some(ref fmt) => { Some(ref fmt) => {
let args: Vec<_> = env::args().collect(); let args: Vec<_> = env::args().collect();
let mut filter_args = Vec::new(); let mut filter_args = Vec::new();
@ -58,7 +58,7 @@ fn cargo_expand() -> io::Result<i32> {
}; };
// Pipe to pygmentize // Pipe to pygmentize
let _wait = match which_pygmentize() { let _wait = match which(&["pygmentize", "-l", "rust"]) {
Some(pyg) => Some(try!(cmd.pipe_to(&[&pyg, "-l", "rust"], None))), Some(pyg) => Some(try!(cmd.pipe_to(&[&pyg, "-l", "rust"], None))),
None => None, None => None,
}; };
@ -159,54 +159,31 @@ fn wrap_args<T, I>(it: I) -> Vec<String>
} }
#[cfg(unix)] #[cfg(unix)]
fn which_rustfmt() -> Option<String> { fn which(cmd: &[&str]) -> Option<String> {
match env::var("RUSTFMT") { if env::args().find(|arg| arg == "--help").is_some() {
Ok(which) => { None
if which.is_empty() { } else {
None match env::var(&cmd[0].to_uppercase()) {
} else { Ok(which) => {
Some(which) if which.is_empty() {
None
} else {
Some(which)
}
} }
} Err(_) => {
Err(_) => { let in_path = Command::new(cmd[0])
let have_rustfmt = Command::new("rustfmt") .args(&cmd[1..])
.stdin(Stdio::null()) .stdin(Stdio::null())
.stdout(Stdio::null()) .stdout(Stdio::null())
.stderr(Stdio::null()) .stderr(Stdio::null())
.spawn() .spawn()
.is_ok(); .is_ok();
if have_rustfmt { if in_path {
Some("rustfmt".to_string()) Some(cmd[0].to_string())
} else { } else {
None None
} }
}
}
}
#[cfg(unix)]
fn which_pygmentize() -> Option<String> {
match env::var("PYGMENTIZE") {
Ok(which) => {
if which.is_empty() {
None
} else {
Some(which)
}
}
Err(_) => {
let have_pygmentize = Command::new("pygmentize")
.arg("-l")
.arg("rust")
.stdin(Stdio::null())
.stdout(Stdio::null())
.stderr(Stdio::null())
.spawn()
.is_ok();
if have_pygmentize {
Some("pygmentize".to_string())
} else {
None
} }
} }
} }