Auto merge of #5513 - matthiaskrgr:reg, r=phansch

fix clippy_dev exit status and make regex match again

changelog: none

Fixes #5510

r? @phansch
This commit is contained in:
bors 2020-04-23 20:56:15 +00:00
commit 02c94352d4
2 changed files with 4 additions and 3 deletions

View File

@ -5,7 +5,7 @@
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
[There are 362 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
[There are over 350 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:

View File

@ -291,10 +291,11 @@ where
}
if !found {
// This happens if the provided regex in `clippy_dev/src/main.rs` is not found in the
// This happens if the provided regex in `clippy_dev/src/main.rs` does not match in the
// given text or file. Most likely this is an error on the programmer's side and the Regex
// is incorrect.
eprintln!("error: regex `{:?}` not found. You may have to update it.", start);
eprintln!("error: regex \n{:?}\ndoesn't match. You may have to update it.", start);
std::process::exit(1);
}
let mut new_lines = new_lines.join("\n");