Skip to content

Commit 02c9435

Browse files
committed
Auto merge of rust-lang#5513 - matthiaskrgr:reg, r=phansch
fix clippy_dev exit status and make regex match again changelog: none Fixes rust-lang#5510 r? @phansch
2 parents a609a9e + 0816412 commit 02c9435

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
77

8-
[There are 362 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
8+
[There are over 350 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
99

1010
We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:
1111

clippy_dev/src/lib.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,11 @@ where
291291
}
292292

293293
if !found {
294-
// This happens if the provided regex in `clippy_dev/src/main.rs` is not found in the
294+
// This happens if the provided regex in `clippy_dev/src/main.rs` does not match in the
295295
// given text or file. Most likely this is an error on the programmer's side and the Regex
296296
// is incorrect.
297-
eprintln!("error: regex `{:?}` not found. You may have to update it.", start);
297+
eprintln!("error: regex \n{:?}\ndoesn't match. You may have to update it.", start);
298+
std::process::exit(1);
298299
}
299300

300301
let mut new_lines = new_lines.join("\n");

0 commit comments

Comments
 (0)