about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-04-23 20:56:15 +0000
committerbors <bors@rust-lang.org>2020-04-23 20:56:15 +0000
commit02c94352d4bbb055dce656da21d86aa1bf672562 (patch)
tree9f4879cb4b9c8fad396250b17bb702ab3dcf50b9
parenta609a9eb790104ff5e840b1846064c61b2d63496 (diff)
parent081641249e804a718815681ef9678d0ba608d530 (diff)
downloadrust-02c94352d4bbb055dce656da21d86aa1bf672562.tar.gz
rust-02c94352d4bbb055dce656da21d86aa1bf672562.zip
Auto merge of #5513 - matthiaskrgr:reg, r=phansch
fix clippy_dev exit status and make regex match again

changelog: none

Fixes #5510

r? @phansch
-rw-r--r--README.md2
-rw-r--r--clippy_dev/src/lib.rs5
2 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index 9d5939db8d5..222b81023a7 100644
--- a/README.md
+++ b/README.md
@@ -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:
 
diff --git a/clippy_dev/src/lib.rs b/clippy_dev/src/lib.rs
index 1f8510f43a6..6fdd282c684 100644
--- a/clippy_dev/src/lib.rs
+++ b/clippy_dev/src/lib.rs
@@ -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");