diff options
| author | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-05-02 12:36:56 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume.gomez@huawei.com> | 2024-05-03 11:04:05 +0200 |
| commit | 3d1062c1a48a3a2c047e65191cc875491f2349b3 (patch) | |
| tree | 54630fed27827eeac7e028f526e59e663e915c93 | |
| parent | 79734f1db8dbe322192dea32c0f6b80ab14c4c1d (diff) | |
| download | rust-3d1062c1a48a3a2c047e65191cc875491f2349b3.tar.gz rust-3d1062c1a48a3a2c047e65191cc875491f2349b3.zip | |
Allow to negate ignored files
| -rw-r--r-- | src/bootstrap/src/core/build_steps/format.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/format.rs b/src/bootstrap/src/core/build_steps/format.rs index 9fc65a0a73a..d9dc34c0137 100644 --- a/src/bootstrap/src/core/build_steps/format.rs +++ b/src/bootstrap/src/core/build_steps/format.rs @@ -115,7 +115,11 @@ pub fn format(build: &Builder<'_>, check: bool, paths: &[PathBuf]) { let rustfmt_config: RustfmtConfig = t!(toml::from_str(&rustfmt_config)); let mut fmt_override = ignore::overrides::OverrideBuilder::new(&build.src); for ignore in rustfmt_config.ignore { - fmt_override.add(&format!("!{ignore}")).expect(&ignore); + if let Some(ignore) = ignore.strip_prefix('!') { + fmt_override.add(ignore).expect(ignore); + } else { + fmt_override.add(&format!("!{ignore}")).expect(&ignore); + } } let git_available = match Command::new("git") .arg("--version") |