diff options
| author | bors <bors@rust-lang.org> | 2022-07-28 07:54:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-28 07:54:15 +0000 |
| commit | 70bca2988b30e4c9b694562dd035912c81916820 (patch) | |
| tree | adc70ae723e2056f1abd1667739d05000731cbe1 | |
| parent | cdd4dfc6d65514f1ac13628d65ca76bb3e0d644f (diff) | |
| parent | 1ed7bff32c3a4a62a644aed139dbb953c0725911 (diff) | |
| download | rust-70bca2988b30e4c9b694562dd035912c81916820.tar.gz rust-70bca2988b30e4c9b694562dd035912c81916820.zip | |
Auto merge of #9253 - Serial-ATA:fix-fmt-err, r=flip1995
Tell the user how to revert `dev setup intellij` changelog: none
| -rw-r--r-- | clippy_dev/src/fmt.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clippy_dev/src/fmt.rs b/clippy_dev/src/fmt.rs index d513a229b7e..3b27f061eb0 100644 --- a/clippy_dev/src/fmt.rs +++ b/clippy_dev/src/fmt.rs @@ -13,7 +13,7 @@ pub enum CliError { IoError(io::Error), RustfmtNotInstalled, WalkDirError(walkdir::Error), - RaSetupActive, + IntellijSetupActive, } impl From<io::Error> for CliError { @@ -48,7 +48,7 @@ pub fn run(check: bool, verbose: bool) { .expect("Failed to read clippy Cargo.toml") .contains(&"[target.'cfg(NOT_A_PLATFORM)'.dependencies]") { - return Err(CliError::RaSetupActive); + return Err(CliError::IntellijSetupActive); } rustfmt_test(context)?; @@ -93,11 +93,11 @@ pub fn run(check: bool, verbose: bool) { CliError::WalkDirError(err) => { eprintln!("error: {}", err); }, - CliError::RaSetupActive => { + CliError::IntellijSetupActive => { eprintln!( "error: a local rustc repo is enabled as path dependency via `cargo dev setup intellij`. Not formatting because that would format the local repo as well! -Please revert the changes to Cargo.tomls first." +Please revert the changes to Cargo.tomls with `cargo dev remove intellij`." ); }, } |
