about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-06-14 16:54:13 +0000
committerbors <bors@rust-lang.org>2022-06-14 16:54:13 +0000
commit32a86c086eefd51c66c7952f2e4c4da8563a1e6f (patch)
tree5ece2f8b34fb6b912653ba9b42f54823ba5e016e
parent5a45805db5f058fc1a84631cb6bc34b63617c805 (diff)
parent08cfb8ddc3082cfe2c81224ef1d090c3fd2394da (diff)
downloadrust-32a86c086eefd51c66c7952f2e4c4da8563a1e6f.tar.gz
rust-32a86c086eefd51c66c7952f2e4c4da8563a1e6f.zip
Auto merge of #8999 - Alexendoo:error-pattern, r=xFrednet
Remove error-pattern comments

The `clippy_lints` one [is unused](https://rust-lang.zulipchat.com/#narrow/stream/257328-clippy/topic/.60error-pattern.60), the others in `ui-toml` also appear not to have an effect

changelog: none
-rw-r--r--clippy_lints/src/lib.rs2
-rw-r--r--tests/ui-toml/bad_toml/conf_bad_toml.rs2
-rw-r--r--tests/ui-toml/bad_toml_type/conf_bad_type.rs3
-rw-r--r--tests/ui-toml/conf_deprecated_key/conf_deprecated_key.rs3
-rw-r--r--tests/ui-toml/good_toml_no_false_negatives/conf_no_false_negatives.rs2
-rw-r--r--tests/ui-toml/toml_unknown_key/conf_unknown_key.rs2
6 files changed, 0 insertions, 14 deletions
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 87595a347d3..02499f6e3ef 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -1,5 +1,3 @@
-// error-pattern:cargo-clippy
-
 #![feature(array_windows)]
 #![feature(binary_heap_into_iter_sorted)]
 #![feature(box_patterns)]
diff --git a/tests/ui-toml/bad_toml/conf_bad_toml.rs b/tests/ui-toml/bad_toml/conf_bad_toml.rs
index 3b9458fc284..f328e4d9d04 100644
--- a/tests/ui-toml/bad_toml/conf_bad_toml.rs
+++ b/tests/ui-toml/bad_toml/conf_bad_toml.rs
@@ -1,3 +1 @@
-// error-pattern: error reading Clippy's configuration file
-
 fn main() {}
diff --git a/tests/ui-toml/bad_toml_type/conf_bad_type.rs b/tests/ui-toml/bad_toml_type/conf_bad_type.rs
index 8a0062423ad..f328e4d9d04 100644
--- a/tests/ui-toml/bad_toml_type/conf_bad_type.rs
+++ b/tests/ui-toml/bad_toml_type/conf_bad_type.rs
@@ -1,4 +1 @@
-// error-pattern: error reading Clippy's configuration file: `blacklisted-names` is expected to be a
-// `Vec < String >` but is a `integer`
-
 fn main() {}
diff --git a/tests/ui-toml/conf_deprecated_key/conf_deprecated_key.rs b/tests/ui-toml/conf_deprecated_key/conf_deprecated_key.rs
index 2577c1eef92..f328e4d9d04 100644
--- a/tests/ui-toml/conf_deprecated_key/conf_deprecated_key.rs
+++ b/tests/ui-toml/conf_deprecated_key/conf_deprecated_key.rs
@@ -1,4 +1 @@
-// error-pattern: error reading Clippy's configuration file: found deprecated field
-// `cyclomatic-complexity-threshold`. Please use `cognitive-complexity-threshold` instead.
-
 fn main() {}
diff --git a/tests/ui-toml/good_toml_no_false_negatives/conf_no_false_negatives.rs b/tests/ui-toml/good_toml_no_false_negatives/conf_no_false_negatives.rs
index 270b9c5c43c..f328e4d9d04 100644
--- a/tests/ui-toml/good_toml_no_false_negatives/conf_no_false_negatives.rs
+++ b/tests/ui-toml/good_toml_no_false_negatives/conf_no_false_negatives.rs
@@ -1,3 +1 @@
-// error-pattern: should give absolutely no error
-
 fn main() {}
diff --git a/tests/ui-toml/toml_unknown_key/conf_unknown_key.rs b/tests/ui-toml/toml_unknown_key/conf_unknown_key.rs
index a47569f62a3..f328e4d9d04 100644
--- a/tests/ui-toml/toml_unknown_key/conf_unknown_key.rs
+++ b/tests/ui-toml/toml_unknown_key/conf_unknown_key.rs
@@ -1,3 +1 @@
-// error-pattern: error reading Clippy's configuration file: unknown key `foobar`
-
 fn main() {}