Skip to content

Commit 70bca29

Browse files
committed
Auto merge of #9253 - Serial-ATA:fix-fmt-err, r=flip1995
Tell the user how to revert `dev setup intellij` changelog: none
2 parents cdd4dfc + 1ed7bff commit 70bca29

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

clippy_dev/src/fmt.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub enum CliError {
1313
IoError(io::Error),
1414
RustfmtNotInstalled,
1515
WalkDirError(walkdir::Error),
16-
RaSetupActive,
16+
IntellijSetupActive,
1717
}
1818

1919
impl From<io::Error> for CliError {
@@ -48,7 +48,7 @@ pub fn run(check: bool, verbose: bool) {
4848
.expect("Failed to read clippy Cargo.toml")
4949
.contains(&"[target.'cfg(NOT_A_PLATFORM)'.dependencies]")
5050
{
51-
return Err(CliError::RaSetupActive);
51+
return Err(CliError::IntellijSetupActive);
5252
}
5353

5454
rustfmt_test(context)?;
@@ -93,11 +93,11 @@ pub fn run(check: bool, verbose: bool) {
9393
CliError::WalkDirError(err) => {
9494
eprintln!("error: {}", err);
9595
},
96-
CliError::RaSetupActive => {
96+
CliError::IntellijSetupActive => {
9797
eprintln!(
9898
"error: a local rustc repo is enabled as path dependency via `cargo dev setup intellij`.
9999
Not formatting because that would format the local repo as well!
100-
Please revert the changes to Cargo.tomls first."
100+
Please revert the changes to Cargo.tomls with `cargo dev remove intellij`."
101101
);
102102
},
103103
}

0 commit comments

Comments
 (0)