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

Replace NO_RUSTFMT with RUSTFMT=""

Browse source
This commit is contained in:
David Tolnay 2016-09-13 21:39:30 -07:00
parent 7a0b0cac8c
commit 3094dffcb0
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main.rs
View file

@ -19,14 +19,16 @@ fn main() {
process::exit(expanded.status.code().unwrap_or(1)); process::exit(expanded.status.code().unwrap_or(1));
} }
let rustfmt = env::var("RUSTFMT").unwrap_or("rustfmt".to_string());
// Just print the expanded output if rustfmt is not available // Just print the expanded output if rustfmt is not available
if env::var("NO_RUSTFMT").is_ok() || !have_rustfmt() { if rustfmt == "" || !have_rustfmt() {
io::stdout().write_all(&expanded.stdout).unwrap(); io::stdout().write_all(&expanded.stdout).unwrap();
return; return;
} }
// Build rustfmt command and give it the expanded code // Build rustfmt command and give it the expanded code
let mut rustfmt = Command::new("rustfmt") let mut rustfmt = Command::new(rustfmt)
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.stderr(Stdio::piped()) .stderr(Stdio::piped())