diff options
| author | David Tolnay <dtolnay@gmail.com> | 2020-09-16 07:09:10 -0700 |
|---|---|---|
| committer | Caleb Cartwright <calebcartwright@users.noreply.github.com> | 2020-10-04 16:58:34 -0500 |
| commit | 14d53f75c94c39d781190d9fd83a95fbcd14b38f (patch) | |
| tree | f13f9c00e271b26f514fabedfbe07df341885b2c /src/format-diff | |
| parent | 2a8ff209f68f9b6ae8be746b4fcd94afe97984e3 (diff) | |
| download | rust-14d53f75c94c39d781190d9fd83a95fbcd14b38f.tar.gz rust-14d53f75c94c39d781190d9fd83a95fbcd14b38f.zip | |
Use rustfmt given by RUSTFMT env var (#4419)
Diffstat (limited to 'src/format-diff')
| -rw-r--r-- | src/format-diff/main.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/format-diff/main.rs b/src/format-diff/main.rs index a73d2da4d03..8a8bb9356ca 100644 --- a/src/format-diff/main.rs +++ b/src/format-diff/main.rs @@ -13,6 +13,8 @@ use serde_json as json; use thiserror::Error; use std::collections::HashSet; +use std::env; +use std::ffi::OsStr; use std::io::{self, BufRead}; use std::process; @@ -94,7 +96,12 @@ fn run_rustfmt(files: &HashSet<String>, ranges: &[Range]) -> Result<(), FormatDi debug!("Files: {:?}", files); debug!("Ranges: {:?}", ranges); - let exit_status = process::Command::new("rustfmt") + let rustfmt_var = env::var_os("RUSTFMT"); + let rustfmt = match &rustfmt_var { + Some(rustfmt) => rustfmt, + None => OsStr::new("rustfmt"), + }; + let exit_status = process::Command::new(rustfmt) .args(files) .arg("--file-lines") .arg(ranges_as_json) |