From 923d2d9b0baf261d0b8286ba84d03214fb6edbac Mon Sep 17 00:00:00 2001 From: Andras Mocsary Date: Wed, 12 Aug 2020 12:50:57 +0200 Subject: [PATCH 1/5] Move away form blacklist terminology --- CHANGELOG.md | 4 +- README.md | 2 +- clippy_lints/src/blacklisted_name.rs | 26 ++++----- clippy_lints/src/lib.rs | 12 ++-- clippy_lints/src/utils/conf.rs | 4 +- src/lintlist/mod.rs | 6 +- tests/ui-toml/bad_toml_type/clippy.toml | 2 +- tests/ui-toml/bad_toml_type/conf_bad_type.rs | 2 +- tests/ui-toml/toml_blacklist/clippy.toml | 2 +- .../conf_french_blacklisted_name.rs | 2 +- .../conf_french_blacklisted_name.stderr | 30 +++++----- .../toml_unknown_key/conf_unknown_key.stderr | 2 +- tests/ui/blacklisted_name.rs | 2 +- tests/ui/blacklisted_name.stderr | 58 +++++++++---------- tests/ui/borrow_box.rs | 2 +- tests/ui/box_vec.rs | 2 +- tests/ui/crashes/ice-2760.rs | 2 +- tests/ui/crashes/ice-3462.rs | 2 +- tests/ui/crashes/regressions.rs | 2 +- tests/ui/eval_order_dependence.rs | 2 +- tests/ui/explicit_write_non_rustfix.rs | 2 +- tests/ui/if_same_then_else.rs | 2 +- tests/ui/if_same_then_else2.rs | 2 +- tests/ui/iter_skip_next.fixed | 2 +- tests/ui/iter_skip_next.rs | 2 +- tests/ui/let_if_seq.rs | 2 +- tests/ui/match_same_arms2.rs | 2 +- tests/ui/methods.rs | 2 +- tests/ui/op_ref.rs | 2 +- tests/ui/redundant_allocation.fixed | 2 +- tests/ui/redundant_allocation.rs | 2 +- tests/ui/skip_while_next.rs | 2 +- tests/ui/swap.fixed | 2 +- tests/ui/swap.rs | 2 +- tests/ui/trivially_copy_pass_by_ref.rs | 2 +- tests/ui/used_underscore_binding.rs | 2 +- 36 files changed, 99 insertions(+), 99 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ce63c0a1574..d2d70207ec11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ Current beta, release 2020-08-27 [#5692](https://github.com/rust-lang/rust-clippy/pull/5692) * [`if_same_then_else`]: Don't assume multiplication is always commutative [#5702](https://github.com/rust-lang/rust-clippy/pull/5702) -* [`blacklisted_name`]: Remove `bar` from the default configuration +* [`disallowed_name`]: Remove `bar` from the default configuration [#5712](https://github.com/rust-lang/rust-clippy/pull/5712) * [`redundant_pattern_matching`]: Avoid suggesting non-`const fn` calls in const contexts [#5724](https://github.com/rust-lang/rust-clippy/pull/5724) @@ -1413,7 +1413,7 @@ Released 2018-09-13 [`await_holding_lock`]: https://rust-lang.github.io/rust-clippy/master/index.html#await_holding_lock [`bad_bit_mask`]: https://rust-lang.github.io/rust-clippy/master/index.html#bad_bit_mask [`bind_instead_of_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#bind_instead_of_map -[`blacklisted_name`]: https://rust-lang.github.io/rust-clippy/master/index.html#blacklisted_name +[`disallowed_name`]: https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_name [`blanket_clippy_restriction_lints`]: https://rust-lang.github.io/rust-clippy/master/index.html#blanket_clippy_restriction_lints [`blocks_in_if_conditions`]: https://rust-lang.github.io/rust-clippy/master/index.html#blocks_in_if_conditions [`bool_comparison`]: https://rust-lang.github.io/rust-clippy/master/index.html#bool_comparison diff --git a/README.md b/README.md index a2984d736416..a3799a970dc6 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ Some lints can be configured in a TOML file named `clippy.toml` or `.clippy.toml value` mapping eg. ```toml -blacklisted-names = ["toto", "tata", "titi"] +disallowed-names = ["toto", "tata", "titi"] cognitive-complexity-threshold = 30 ``` diff --git a/clippy_lints/src/blacklisted_name.rs b/clippy_lints/src/blacklisted_name.rs index 153870fb4165..7b522e393396 100644 --- a/clippy_lints/src/blacklisted_name.rs +++ b/clippy_lints/src/blacklisted_name.rs @@ -5,7 +5,7 @@ use rustc_lint::{LateContext, LateLintPass}; use rustc_session::{declare_tool_lint, impl_lint_pass}; declare_clippy_lint! { - /// **What it does:** Checks for usage of blacklisted names for variables, such + /// **What it does:** Checks for usage of disallowed names for variables, such /// as `foo`. /// /// **Why is this bad?** These names are usually placeholder names and should be @@ -17,33 +17,33 @@ declare_clippy_lint! { /// ```rust /// let foo = 3.14; /// ``` - pub BLACKLISTED_NAME, + pub DISALLOWED_NAME, style, - "usage of a blacklisted/placeholder name" + "usage of a disallowed/placeholder name" } #[derive(Clone, Debug)] -pub struct BlacklistedName { - blacklist: FxHashSet, +pub struct DisAllowedName { + disallowlist: FxHashSet, } -impl BlacklistedName { - pub fn new(blacklist: FxHashSet) -> Self { - Self { blacklist } +impl DisAllowedName { + pub fn new(disallowlist: FxHashSet) -> Self { + Self { disallowlist } } } -impl_lint_pass!(BlacklistedName => [BLACKLISTED_NAME]); +impl_lint_pass!(DisAllowedName => [DISALLOWED_NAME]); -impl<'tcx> LateLintPass<'tcx> for BlacklistedName { +impl<'tcx> LateLintPass<'tcx> for DisAllowedName { fn check_pat(&mut self, cx: &LateContext<'tcx>, pat: &'tcx Pat<'_>) { if let PatKind::Binding(.., ident, _) = pat.kind { - if self.blacklist.contains(&ident.name.to_string()) { + if self.disallowlist.contains(&ident.name.to_string()) { span_lint( cx, - BLACKLISTED_NAME, + DISALLOWED_NAME, ident.span, - &format!("use of a blacklisted/placeholder name `{}`", ident.name), + &format!("use of a disallowed/placeholder name `{}`", ident.name), ); } } diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index d45394ab8d21..def047ed1863 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -158,7 +158,7 @@ mod atomic_ordering; mod attrs; mod await_holding_lock; mod bit_mask; -mod blacklisted_name; +mod disallowed_name; mod blocks_in_if_conditions; mod booleans; mod bytecount; @@ -494,7 +494,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: &bit_mask::BAD_BIT_MASK, &bit_mask::INEFFECTIVE_BIT_MASK, &bit_mask::VERBOSE_BIT_MASK, - &blacklisted_name::BLACKLISTED_NAME, + &disallowed_name::DISALLOWED_NAME, &blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS, &booleans::LOGIC_BUG, &booleans::NONMINIMAL_BOOL, @@ -954,8 +954,8 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: store.register_late_pass(|| box swap::Swap); store.register_late_pass(|| box overflow_check_conditional::OverflowCheckConditional); store.register_late_pass(|| box new_without_default::NewWithoutDefault::default()); - let blacklisted_names = conf.blacklisted_names.iter().cloned().collect::>(); - store.register_late_pass(move || box blacklisted_name::BlacklistedName::new(blacklisted_names.clone())); + let disallowed_names = conf.disallowed_names.iter().cloned().collect::>(); + store.register_late_pass(move || box disallowed_name::DisAllowedName::new(disallowed_names.clone())); let too_many_arguments_threshold1 = conf.too_many_arguments_threshold; let too_many_lines_threshold2 = conf.too_many_lines_threshold; store.register_late_pass(move || box functions::Functions::new(too_many_arguments_threshold1, too_many_lines_threshold2)); @@ -1235,7 +1235,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&bit_mask::BAD_BIT_MASK), LintId::of(&bit_mask::INEFFECTIVE_BIT_MASK), LintId::of(&bit_mask::VERBOSE_BIT_MASK), - LintId::of(&blacklisted_name::BLACKLISTED_NAME), + LintId::of(&disallowed_name::DISALLOWED_NAME), LintId::of(&blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS), LintId::of(&booleans::LOGIC_BUG), LintId::of(&booleans::NONMINIMAL_BOOL), @@ -1492,7 +1492,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&attrs::BLANKET_CLIPPY_RESTRICTION_LINTS), LintId::of(&attrs::UNKNOWN_CLIPPY_LINTS), LintId::of(&bit_mask::VERBOSE_BIT_MASK), - LintId::of(&blacklisted_name::BLACKLISTED_NAME), + LintId::of(&disallowed_name::DISALLOWED_NAME), LintId::of(&blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS), LintId::of(&collapsible_if::COLLAPSIBLE_IF), LintId::of(&comparison_chain::COMPARISON_CHAIN), diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs index 292dbd7ad6b4..fa6d8343eff7 100644 --- a/clippy_lints/src/utils/conf.rs +++ b/clippy_lints/src/utils/conf.rs @@ -106,8 +106,8 @@ macro_rules! define_Conf { pub use self::helpers::Conf; define_Conf! { - /// Lint: BLACKLISTED_NAME. The list of blacklisted names to lint about. NB: `bar` is not here since it has legitimate uses - (blacklisted_names, "blacklisted_names": Vec, ["foo", "baz", "quux"].iter().map(ToString::to_string).collect()), + /// Lint: DISALLOWED_NAME. The list of disallowed names to lint about. NB: `bar` is not here since it has legitimate uses + (disallowed_names, "disallowed_names": Vec, ["foo", "baz", "quux"].iter().map(ToString::to_string).collect()), /// Lint: COGNITIVE_COMPLEXITY. The maximum cognitive complexity a function can have (cognitive_complexity_threshold, "cognitive_complexity_threshold": u64, 25), /// DEPRECATED LINT: CYCLOMATIC_COMPLEXITY. Use the Cognitive Complexity lint instead. diff --git a/src/lintlist/mod.rs b/src/lintlist/mod.rs index c50c6b900ae0..45d58ec82362 100644 --- a/src/lintlist/mod.rs +++ b/src/lintlist/mod.rs @@ -74,11 +74,11 @@ pub static ref ALL_LINTS: Vec = vec![ module: "methods", }, Lint { - name: "blacklisted_name", + name: "disallowed_name", group: "style", - desc: "usage of a blacklisted/placeholder name", + desc: "usage of a disallowed/placeholder name", deprecation: None, - module: "blacklisted_name", + module: "disallowed_name", }, Lint { name: "blanket_clippy_restriction_lints", diff --git a/tests/ui-toml/bad_toml_type/clippy.toml b/tests/ui-toml/bad_toml_type/clippy.toml index 168675394d7f..d48bab08f690 100644 --- a/tests/ui-toml/bad_toml_type/clippy.toml +++ b/tests/ui-toml/bad_toml_type/clippy.toml @@ -1 +1 @@ -blacklisted-names = 42 +disallowed-names = 42 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 8a0062423ad1..7e1f028d2f29 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,4 @@ -// error-pattern: error reading Clippy's configuration file: `blacklisted-names` is expected to be a +// error-pattern: error reading Clippy's configuration file: `disallowed-names` is expected to be a // `Vec < String >` but is a `integer` fn main() {} diff --git a/tests/ui-toml/toml_blacklist/clippy.toml b/tests/ui-toml/toml_blacklist/clippy.toml index 6abe5a3bbc27..e4f0cb6df57a 100644 --- a/tests/ui-toml/toml_blacklist/clippy.toml +++ b/tests/ui-toml/toml_blacklist/clippy.toml @@ -1 +1 @@ -blacklisted-names = ["toto", "tata", "titi"] +disallowed-names = ["toto", "tata", "titi"] diff --git a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs index cb35d0e8589d..897daee0fa65 100644 --- a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs +++ b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs @@ -1,7 +1,7 @@ #![allow(dead_code)] #![allow(clippy::single_match)] #![allow(unused_variables)] -#![warn(clippy::blacklisted_name)] +#![warn(clippy::disallowed_name)] fn test(toto: ()) {} diff --git a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr index 84ba77851f77..b9a15043f2de 100644 --- a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr +++ b/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr @@ -1,43 +1,43 @@ -error: use of a blacklisted/placeholder name `toto` - --> $DIR/conf_french_blacklisted_name.rs:6:9 +error: use of a disallowed/placeholder name `toto` + --> $DIR/conf_french_disallowed_name.rs:6:9 | LL | fn test(toto: ()) {} | ^^^^ | - = note: `-D clippy::blacklisted-name` implied by `-D warnings` + = note: `-D clippy::disallowed-name` implied by `-D warnings` -error: use of a blacklisted/placeholder name `toto` - --> $DIR/conf_french_blacklisted_name.rs:9:9 +error: use of a disallowed/placeholder name `toto` + --> $DIR/conf_french_disallowed_name.rs:9:9 | LL | let toto = 42; | ^^^^ -error: use of a blacklisted/placeholder name `tata` - --> $DIR/conf_french_blacklisted_name.rs:10:9 +error: use of a disallowed/placeholder name `tata` + --> $DIR/conf_french_disallowed_name.rs:10:9 | LL | let tata = 42; | ^^^^ -error: use of a blacklisted/placeholder name `titi` - --> $DIR/conf_french_blacklisted_name.rs:11:9 +error: use of a disallowed/placeholder name `titi` + --> $DIR/conf_french_disallowed_name.rs:11:9 | LL | let titi = 42; | ^^^^ -error: use of a blacklisted/placeholder name `toto` - --> $DIR/conf_french_blacklisted_name.rs:17:10 +error: use of a disallowed/placeholder name `toto` + --> $DIR/conf_french_disallowed_name.rs:17:10 | LL | (toto, Some(tata), titi @ Some(_)) => (), | ^^^^ -error: use of a blacklisted/placeholder name `tata` - --> $DIR/conf_french_blacklisted_name.rs:17:21 +error: use of a disallowed/placeholder name `tata` + --> $DIR/conf_french_disallowed_name.rs:17:21 | LL | (toto, Some(tata), titi @ Some(_)) => (), | ^^^^ -error: use of a blacklisted/placeholder name `titi` - --> $DIR/conf_french_blacklisted_name.rs:17:28 +error: use of a disallowed/placeholder name `titi` + --> $DIR/conf_french_disallowed_name.rs:17:28 | LL | (toto, Some(tata), titi @ Some(_)) => (), | ^^^^ diff --git a/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr b/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr index 6fbba01416a8..88e0bb50012f 100644 --- a/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr +++ b/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr @@ -1,4 +1,4 @@ -error: error reading Clippy's configuration file `$DIR/clippy.toml`: unknown field `foobar`, expected one of `blacklisted-names`, `cognitive-complexity-threshold`, `cyclomatic-complexity-threshold`, `doc-valid-idents`, `too-many-arguments-threshold`, `type-complexity-threshold`, `single-char-binding-names-threshold`, `too-large-for-stack`, `enum-variant-name-threshold`, `enum-variant-size-threshold`, `verbose-bit-mask-threshold`, `literal-representation-threshold`, `trivial-copy-size-limit`, `too-many-lines-threshold`, `array-size-threshold`, `vec-box-size-threshold`, `max-trait-bounds`, `max-struct-bools`, `max-fn-params-bools`, `warn-on-all-wildcard-imports`, `third-party` at line 5 column 1 +error: error reading Clippy's configuration file `$DIR/clippy.toml`: unknown field `foobar`, expected one of `disallowed-names`, `cognitive-complexity-threshold`, `cyclomatic-complexity-threshold`, `doc-valid-idents`, `too-many-arguments-threshold`, `type-complexity-threshold`, `single-char-binding-names-threshold`, `too-large-for-stack`, `enum-variant-name-threshold`, `enum-variant-size-threshold`, `verbose-bit-mask-threshold`, `literal-representation-threshold`, `trivial-copy-size-limit`, `too-many-lines-threshold`, `array-size-threshold`, `vec-box-size-threshold`, `max-trait-bounds`, `max-struct-bools`, `max-fn-params-bools`, `warn-on-all-wildcard-imports`, `third-party` at line 5 column 1 error: aborting due to previous error diff --git a/tests/ui/blacklisted_name.rs b/tests/ui/blacklisted_name.rs index cb15bdd2f1b2..cbcf680d1815 100644 --- a/tests/ui/blacklisted_name.rs +++ b/tests/ui/blacklisted_name.rs @@ -6,7 +6,7 @@ unused_mut, unused_variables )] -#![warn(clippy::blacklisted_name)] +#![warn(clippy::disallowed_name)] fn test(foo: ()) {} diff --git a/tests/ui/blacklisted_name.stderr b/tests/ui/blacklisted_name.stderr index 70dbdaece8b6..240c167e2234 100644 --- a/tests/ui/blacklisted_name.stderr +++ b/tests/ui/blacklisted_name.stderr @@ -1,85 +1,85 @@ -error: use of a blacklisted/placeholder name `foo` - --> $DIR/blacklisted_name.rs:11:9 +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:11:9 | LL | fn test(foo: ()) {} | ^^^ | - = note: `-D clippy::blacklisted-name` implied by `-D warnings` + = note: `-D clippy::disallowed-name` implied by `-D warnings` -error: use of a blacklisted/placeholder name `foo` - --> $DIR/blacklisted_name.rs:14:9 +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:14:9 | LL | let foo = 42; | ^^^ -error: use of a blacklisted/placeholder name `baz` - --> $DIR/blacklisted_name.rs:15:9 +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:15:9 | LL | let baz = 42; | ^^^ -error: use of a blacklisted/placeholder name `quux` - --> $DIR/blacklisted_name.rs:16:9 +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:16:9 | LL | let quux = 42; | ^^^^ -error: use of a blacklisted/placeholder name `foo` - --> $DIR/blacklisted_name.rs:27:10 +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:27:10 | LL | (foo, Some(baz), quux @ Some(_)) => (), | ^^^ -error: use of a blacklisted/placeholder name `baz` - --> $DIR/blacklisted_name.rs:27:20 +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:27:20 | LL | (foo, Some(baz), quux @ Some(_)) => (), | ^^^ -error: use of a blacklisted/placeholder name `quux` - --> $DIR/blacklisted_name.rs:27:26 +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:27:26 | LL | (foo, Some(baz), quux @ Some(_)) => (), | ^^^^ -error: use of a blacklisted/placeholder name `foo` - --> $DIR/blacklisted_name.rs:32:19 +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:32:19 | LL | fn issue_1647(mut foo: u8) { | ^^^ -error: use of a blacklisted/placeholder name `baz` - --> $DIR/blacklisted_name.rs:33:13 +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:33:13 | LL | let mut baz = 0; | ^^^ -error: use of a blacklisted/placeholder name `quux` - --> $DIR/blacklisted_name.rs:34:21 +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:34:21 | LL | if let Some(mut quux) = Some(42) {} | ^^^^ -error: use of a blacklisted/placeholder name `baz` - --> $DIR/blacklisted_name.rs:38:13 +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:38:13 | LL | let ref baz = 0; | ^^^ -error: use of a blacklisted/placeholder name `quux` - --> $DIR/blacklisted_name.rs:39:21 +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:39:21 | LL | if let Some(ref quux) = Some(42) {} | ^^^^ -error: use of a blacklisted/placeholder name `baz` - --> $DIR/blacklisted_name.rs:43:17 +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:43:17 | LL | let ref mut baz = 0; | ^^^ -error: use of a blacklisted/placeholder name `quux` - --> $DIR/blacklisted_name.rs:44:25 +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:44:25 | LL | if let Some(ref mut quux) = Some(42) {} | ^^^^ diff --git a/tests/ui/borrow_box.rs b/tests/ui/borrow_box.rs index 1901de46ca89..7d4bc4097035 100644 --- a/tests/ui/borrow_box.rs +++ b/tests/ui/borrow_box.rs @@ -1,5 +1,5 @@ #![deny(clippy::borrowed_box)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] #![allow(unused_variables)] #![allow(dead_code)] diff --git a/tests/ui/box_vec.rs b/tests/ui/box_vec.rs index 87b67c23704c..5877fdbe3e8d 100644 --- a/tests/ui/box_vec.rs +++ b/tests/ui/box_vec.rs @@ -1,6 +1,6 @@ #![warn(clippy::all)] #![allow(clippy::boxed_local, clippy::needless_pass_by_value)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] macro_rules! boxit { ($init:expr, $x:ty) => { diff --git a/tests/ui/crashes/ice-2760.rs b/tests/ui/crashes/ice-2760.rs index 9e5e299c336a..fd9e0e81f16d 100644 --- a/tests/ui/crashes/ice-2760.rs +++ b/tests/ui/crashes/ice-2760.rs @@ -2,7 +2,7 @@ #![allow( unused_variables, - clippy::blacklisted_name, + clippy::disallowed_name, clippy::needless_pass_by_value, dead_code )] diff --git a/tests/ui/crashes/ice-3462.rs b/tests/ui/crashes/ice-3462.rs index 95c7dff9be36..c223a936a206 100644 --- a/tests/ui/crashes/ice-3462.rs +++ b/tests/ui/crashes/ice-3462.rs @@ -1,7 +1,7 @@ // run-pass #![warn(clippy::all)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] #![allow(unused)] /// Test for https://github.com/rust-lang/rust-clippy/issues/3462 diff --git a/tests/ui/crashes/regressions.rs b/tests/ui/crashes/regressions.rs index 3d5063d1a3a7..539d0dbe132f 100644 --- a/tests/ui/crashes/regressions.rs +++ b/tests/ui/crashes/regressions.rs @@ -1,6 +1,6 @@ // run-pass -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] pub fn foo(bar: *const u8) { println!("{:#p}", bar); diff --git a/tests/ui/eval_order_dependence.rs b/tests/ui/eval_order_dependence.rs index d806bc6d4010..49fcfea90711 100644 --- a/tests/ui/eval_order_dependence.rs +++ b/tests/ui/eval_order_dependence.rs @@ -5,7 +5,7 @@ clippy::many_single_char_names, clippy::no_effect, dead_code, - clippy::blacklisted_name + clippy::disallowed_name )] fn main() { let mut x = 0; diff --git a/tests/ui/explicit_write_non_rustfix.rs b/tests/ui/explicit_write_non_rustfix.rs index f21e8ef935bd..1a58a9082e16 100644 --- a/tests/ui/explicit_write_non_rustfix.rs +++ b/tests/ui/explicit_write_non_rustfix.rs @@ -1,4 +1,4 @@ -#![allow(unused_imports, clippy::blacklisted_name)] +#![allow(unused_imports, clippy::disallowed_name)] #![warn(clippy::explicit_write)] fn main() { diff --git a/tests/ui/if_same_then_else.rs b/tests/ui/if_same_then_else.rs index 9c5fe02f7519..deae8ee3b0e5 100644 --- a/tests/ui/if_same_then_else.rs +++ b/tests/ui/if_same_then_else.rs @@ -1,6 +1,6 @@ #![warn(clippy::if_same_then_else)] #![allow( - clippy::blacklisted_name, + clippy::disallowed_name, clippy::eq_op, clippy::never_loop, clippy::no_effect, diff --git a/tests/ui/if_same_then_else2.rs b/tests/ui/if_same_then_else2.rs index 3cc21809264f..5ac93ffdcc07 100644 --- a/tests/ui/if_same_then_else2.rs +++ b/tests/ui/if_same_then_else2.rs @@ -1,6 +1,6 @@ #![warn(clippy::if_same_then_else)] #![allow( - clippy::blacklisted_name, + clippy::disallowed_name, clippy::collapsible_if, clippy::ifs_same_cond, clippy::needless_return diff --git a/tests/ui/iter_skip_next.fixed b/tests/ui/iter_skip_next.fixed index 928b6acb9510..5bd92ffd2a0c 100644 --- a/tests/ui/iter_skip_next.fixed +++ b/tests/ui/iter_skip_next.fixed @@ -2,7 +2,7 @@ // aux-build:option_helpers.rs #![warn(clippy::iter_skip_next)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] #![allow(clippy::iter_nth)] extern crate option_helpers; diff --git a/tests/ui/iter_skip_next.rs b/tests/ui/iter_skip_next.rs index 7075e2598ebe..44ab4bf1f51c 100644 --- a/tests/ui/iter_skip_next.rs +++ b/tests/ui/iter_skip_next.rs @@ -2,7 +2,7 @@ // aux-build:option_helpers.rs #![warn(clippy::iter_skip_next)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] #![allow(clippy::iter_nth)] extern crate option_helpers; diff --git a/tests/ui/let_if_seq.rs b/tests/ui/let_if_seq.rs index 802beeb4be6b..dbf6bdc66b3c 100644 --- a/tests/ui/let_if_seq.rs +++ b/tests/ui/let_if_seq.rs @@ -2,7 +2,7 @@ unused_variables, unused_assignments, clippy::similar_names, - clippy::blacklisted_name + clippy::disallowed_name )] #![warn(clippy::useless_let_if_seq)] diff --git a/tests/ui/match_same_arms2.rs b/tests/ui/match_same_arms2.rs index e1401d2796a5..97b4e3eb5813 100644 --- a/tests/ui/match_same_arms2.rs +++ b/tests/ui/match_same_arms2.rs @@ -1,5 +1,5 @@ #![warn(clippy::match_same_arms)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] fn bar(_: T) {} fn foo() -> bool { diff --git a/tests/ui/methods.rs b/tests/ui/methods.rs index 80dd2f744b3a..ef5d391ce4ff 100644 --- a/tests/ui/methods.rs +++ b/tests/ui/methods.rs @@ -3,7 +3,7 @@ #![warn(clippy::all, clippy::pedantic)] #![allow( - clippy::blacklisted_name, + clippy::disallowed_name, clippy::default_trait_access, clippy::missing_docs_in_private_items, clippy::missing_safety_doc, diff --git a/tests/ui/op_ref.rs b/tests/ui/op_ref.rs index 6605c967c8e7..2d6509b195c0 100644 --- a/tests/ui/op_ref.rs +++ b/tests/ui/op_ref.rs @@ -1,4 +1,4 @@ -#![allow(unused_variables, clippy::blacklisted_name)] +#![allow(unused_variables, clippy::disallowed_name)] #![warn(clippy::op_ref)] #![allow(clippy::many_single_char_names)] use std::collections::HashSet; diff --git a/tests/ui/redundant_allocation.fixed b/tests/ui/redundant_allocation.fixed index 6514fd6d1ac7..921b8d8dbb4e 100644 --- a/tests/ui/redundant_allocation.fixed +++ b/tests/ui/redundant_allocation.fixed @@ -1,7 +1,7 @@ // run-rustfix #![warn(clippy::all)] #![allow(clippy::boxed_local, clippy::needless_pass_by_value)] -#![allow(clippy::blacklisted_name, unused_variables, dead_code)] +#![allow(clippy::disallowed_name, unused_variables, dead_code)] use std::boxed::Box; use std::rc::Rc; diff --git a/tests/ui/redundant_allocation.rs b/tests/ui/redundant_allocation.rs index 677b3e56d4dc..1f83041c8bb4 100644 --- a/tests/ui/redundant_allocation.rs +++ b/tests/ui/redundant_allocation.rs @@ -1,7 +1,7 @@ // run-rustfix #![warn(clippy::all)] #![allow(clippy::boxed_local, clippy::needless_pass_by_value)] -#![allow(clippy::blacklisted_name, unused_variables, dead_code)] +#![allow(clippy::disallowed_name, unused_variables, dead_code)] use std::boxed::Box; use std::rc::Rc; diff --git a/tests/ui/skip_while_next.rs b/tests/ui/skip_while_next.rs index a522c0f08b20..bedd2704100c 100644 --- a/tests/ui/skip_while_next.rs +++ b/tests/ui/skip_while_next.rs @@ -1,7 +1,7 @@ // aux-build:option_helpers.rs #![warn(clippy::skip_while_next)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] extern crate option_helpers; use option_helpers::IteratorFalsePositives; diff --git a/tests/ui/swap.fixed b/tests/ui/swap.fixed index 0f8f839a0d54..a27faece2efe 100644 --- a/tests/ui/swap.fixed +++ b/tests/ui/swap.fixed @@ -2,7 +2,7 @@ #![warn(clippy::all)] #![allow( - clippy::blacklisted_name, + clippy::disallowed_name, clippy::no_effect, clippy::redundant_clone, redundant_semicolons, diff --git a/tests/ui/swap.rs b/tests/ui/swap.rs index 5763d9e82d48..36c7842b2c25 100644 --- a/tests/ui/swap.rs +++ b/tests/ui/swap.rs @@ -2,7 +2,7 @@ #![warn(clippy::all)] #![allow( - clippy::blacklisted_name, + clippy::disallowed_name, clippy::no_effect, clippy::redundant_clone, redundant_semicolons, diff --git a/tests/ui/trivially_copy_pass_by_ref.rs b/tests/ui/trivially_copy_pass_by_ref.rs index e7e0a31febc4..6656c1d00fa9 100644 --- a/tests/ui/trivially_copy_pass_by_ref.rs +++ b/tests/ui/trivially_copy_pass_by_ref.rs @@ -4,7 +4,7 @@ #![deny(clippy::trivially_copy_pass_by_ref)] #![allow( clippy::many_single_char_names, - clippy::blacklisted_name, + clippy::disallowed_name, clippy::redundant_field_names )] diff --git a/tests/ui/used_underscore_binding.rs b/tests/ui/used_underscore_binding.rs index 8e0243c49aaa..d8f02cd72358 100644 --- a/tests/ui/used_underscore_binding.rs +++ b/tests/ui/used_underscore_binding.rs @@ -3,7 +3,7 @@ #![feature(rustc_private)] #![warn(clippy::all)] -#![allow(clippy::blacklisted_name)] +#![allow(clippy::disallowed_name)] #![warn(clippy::used_underscore_binding)] #[macro_use] From 5ba20a0e386052c1c286bbcada0f50c094d297fe Mon Sep 17 00:00:00 2001 From: Andras Mocsary <425404+mocsy@users.noreply.github.com> Date: Tue, 18 Aug 2020 12:56:19 +0200 Subject: [PATCH 2/5] Lint rename and utils/conf rename --- .../src/{blacklisted_name.rs => disallowed_name.rs} | 8 ++++---- clippy_lints/src/lib.rs | 3 ++- clippy_lints/src/utils/conf.rs | 8 ++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) rename clippy_lints/src/{blacklisted_name.rs => disallowed_name.rs} (89%) diff --git a/clippy_lints/src/blacklisted_name.rs b/clippy_lints/src/disallowed_name.rs similarity index 89% rename from clippy_lints/src/blacklisted_name.rs rename to clippy_lints/src/disallowed_name.rs index 7b522e393396..65e051e3149e 100644 --- a/clippy_lints/src/blacklisted_name.rs +++ b/clippy_lints/src/disallowed_name.rs @@ -23,19 +23,19 @@ declare_clippy_lint! { } #[derive(Clone, Debug)] -pub struct DisAllowedName { +pub struct DisallowedName { disallowlist: FxHashSet, } -impl DisAllowedName { +impl DisallowedName { pub fn new(disallowlist: FxHashSet) -> Self { Self { disallowlist } } } -impl_lint_pass!(DisAllowedName => [DISALLOWED_NAME]); +impl_lint_pass!(DisallowedName => [DISALLOWED_NAME]); -impl<'tcx> LateLintPass<'tcx> for DisAllowedName { +impl<'tcx> LateLintPass<'tcx> for DisallowedName { fn check_pat(&mut self, cx: &LateContext<'tcx>, pat: &'tcx Pat<'_>) { if let PatKind::Binding(.., ident, _) = pat.kind { if self.disallowlist.contains(&ident.name.to_string()) { diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index def047ed1863..0fe57fa399bc 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -955,7 +955,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: store.register_late_pass(|| box overflow_check_conditional::OverflowCheckConditional); store.register_late_pass(|| box new_without_default::NewWithoutDefault::default()); let disallowed_names = conf.disallowed_names.iter().cloned().collect::>(); - store.register_late_pass(move || box disallowed_name::DisAllowedName::new(disallowed_names.clone())); + store.register_late_pass(move || box disallowed_name::DisallowedName::new(disallowed_names.clone())); let too_many_arguments_threshold1 = conf.too_many_arguments_threshold; let too_many_lines_threshold2 = conf.too_many_lines_threshold; store.register_late_pass(move || box functions::Functions::new(too_many_arguments_threshold1, too_many_lines_threshold2)); @@ -1859,6 +1859,7 @@ pub fn register_renamed(ls: &mut rustc_lint::LintStore) { ls.register_renamed("clippy::for_loop_over_option", "clippy::for_loops_over_fallibles"); ls.register_renamed("clippy::for_loop_over_result", "clippy::for_loops_over_fallibles"); ls.register_renamed("clippy::identity_conversion", "clippy::useless_conversion"); + ls.register_renamed("clippy::blacklisted_name", "clippy::disallowed_name"); } // only exists to let the dogfood integration test works. diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs index fa6d8343eff7..bb0ff2afb043 100644 --- a/clippy_lints/src/utils/conf.rs +++ b/clippy_lints/src/utils/conf.rs @@ -106,6 +106,8 @@ macro_rules! define_Conf { pub use self::helpers::Conf; define_Conf! { + /// DEPRECATED LINT: BLACKLISTED_NAME. Use the Disallowed Names lint instead. + (blacklisted_names, "blacklisted_names": Vec, ["foo", "baz", "quux"].iter().map(ToString::to_string).collect()), /// Lint: DISALLOWED_NAME. The list of disallowed names to lint about. NB: `bar` is not here since it has legitimate uses (disallowed_names, "disallowed_names": Vec, ["foo", "baz", "quux"].iter().map(ToString::to_string).collect()), /// Lint: COGNITIVE_COMPLEXITY. The maximum cognitive complexity a function can have @@ -234,6 +236,12 @@ pub fn read(path: &Path) -> (Conf, Vec) { errors.push(Error::Toml(cyc_err)); } + let block_ls_field = toml_ref.blacklisted_names; + if !block_ls_field.is_empty() { + let block_err = "found deprecated field `blacklisted-names`. Please use `disallowed-names` instead.".to_string(); + errors.push(Error::Toml(block_err)); + } + (toml, errors) }, Err(e) => { From 1d0286c25c233a7cce12307a3aeab68cd590a1ae Mon Sep 17 00:00:00 2001 From: Andras Mocsary <425404+mocsy@users.noreply.github.com> Date: Tue, 18 Aug 2020 14:56:55 +0200 Subject: [PATCH 3/5] Not all lints are defined properly --- CHANGELOG.md | 2 +- clippy_lints/src/lib.rs | 8 ++++---- clippy_lints/src/utils/conf.rs | 2 +- src/lintlist/mod.rs | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2d70207ec11..974493ab57b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1413,7 +1413,6 @@ Released 2018-09-13 [`await_holding_lock`]: https://rust-lang.github.io/rust-clippy/master/index.html#await_holding_lock [`bad_bit_mask`]: https://rust-lang.github.io/rust-clippy/master/index.html#bad_bit_mask [`bind_instead_of_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#bind_instead_of_map -[`disallowed_name`]: https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_name [`blanket_clippy_restriction_lints`]: https://rust-lang.github.io/rust-clippy/master/index.html#blanket_clippy_restriction_lints [`blocks_in_if_conditions`]: https://rust-lang.github.io/rust-clippy/master/index.html#blocks_in_if_conditions [`bool_comparison`]: https://rust-lang.github.io/rust-clippy/master/index.html#bool_comparison @@ -1455,6 +1454,7 @@ Released 2018-09-13 [`deref_addrof`]: https://rust-lang.github.io/rust-clippy/master/index.html#deref_addrof [`derive_hash_xor_eq`]: https://rust-lang.github.io/rust-clippy/master/index.html#derive_hash_xor_eq [`derive_ord_xor_partial_ord`]: https://rust-lang.github.io/rust-clippy/master/index.html#derive_ord_xor_partial_ord +[`disallowed_name`]: https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_name [`diverging_sub_expression`]: https://rust-lang.github.io/rust-clippy/master/index.html#diverging_sub_expression [`doc_markdown`]: https://rust-lang.github.io/rust-clippy/master/index.html#doc_markdown [`double_comparisons`]: https://rust-lang.github.io/rust-clippy/master/index.html#double_comparisons diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 0fe57fa399bc..5ebbd6ee9ca6 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -158,7 +158,6 @@ mod atomic_ordering; mod attrs; mod await_holding_lock; mod bit_mask; -mod disallowed_name; mod blocks_in_if_conditions; mod booleans; mod bytecount; @@ -173,6 +172,7 @@ mod dbg_macro; mod default_trait_access; mod dereference; mod derive; +mod disallowed_name; mod doc; mod double_comparison; mod double_parens; @@ -494,7 +494,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: &bit_mask::BAD_BIT_MASK, &bit_mask::INEFFECTIVE_BIT_MASK, &bit_mask::VERBOSE_BIT_MASK, - &disallowed_name::DISALLOWED_NAME, &blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS, &booleans::LOGIC_BUG, &booleans::NONMINIMAL_BOOL, @@ -516,6 +515,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: &derive::DERIVE_ORD_XOR_PARTIAL_ORD, &derive::EXPL_IMPL_CLONE_ON_COPY, &derive::UNSAFE_DERIVE_DESERIALIZE, + &disallowed_name::DISALLOWED_NAME, &doc::DOC_MARKDOWN, &doc::MISSING_ERRORS_DOC, &doc::MISSING_SAFETY_DOC, @@ -1235,7 +1235,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&bit_mask::BAD_BIT_MASK), LintId::of(&bit_mask::INEFFECTIVE_BIT_MASK), LintId::of(&bit_mask::VERBOSE_BIT_MASK), - LintId::of(&disallowed_name::DISALLOWED_NAME), LintId::of(&blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS), LintId::of(&booleans::LOGIC_BUG), LintId::of(&booleans::NONMINIMAL_BOOL), @@ -1246,6 +1245,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&copies::IF_SAME_THEN_ELSE), LintId::of(&derive::DERIVE_HASH_XOR_EQ), LintId::of(&derive::DERIVE_ORD_XOR_PARTIAL_ORD), + LintId::of(&disallowed_name::DISALLOWED_NAME), LintId::of(&doc::MISSING_SAFETY_DOC), LintId::of(&doc::NEEDLESS_DOCTEST_MAIN), LintId::of(&double_comparison::DOUBLE_COMPARISONS), @@ -1492,10 +1492,10 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&attrs::BLANKET_CLIPPY_RESTRICTION_LINTS), LintId::of(&attrs::UNKNOWN_CLIPPY_LINTS), LintId::of(&bit_mask::VERBOSE_BIT_MASK), - LintId::of(&disallowed_name::DISALLOWED_NAME), LintId::of(&blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS), LintId::of(&collapsible_if::COLLAPSIBLE_IF), LintId::of(&comparison_chain::COMPARISON_CHAIN), + LintId::of(&disallowed_name::DISALLOWED_NAME), LintId::of(&doc::MISSING_SAFETY_DOC), LintId::of(&doc::NEEDLESS_DOCTEST_MAIN), LintId::of(&enum_variants::ENUM_VARIANT_NAMES), diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs index bb0ff2afb043..73a85c879a1f 100644 --- a/clippy_lints/src/utils/conf.rs +++ b/clippy_lints/src/utils/conf.rs @@ -236,7 +236,7 @@ pub fn read(path: &Path) -> (Conf, Vec) { errors.push(Error::Toml(cyc_err)); } - let block_ls_field = toml_ref.blacklisted_names; + let block_ls_field = &toml_ref.blacklisted_names; if !block_ls_field.is_empty() { let block_err = "found deprecated field `blacklisted-names`. Please use `disallowed-names` instead.".to_string(); errors.push(Error::Toml(block_err)); diff --git a/src/lintlist/mod.rs b/src/lintlist/mod.rs index 45d58ec82362..ac31187b3581 100644 --- a/src/lintlist/mod.rs +++ b/src/lintlist/mod.rs @@ -73,13 +73,6 @@ pub static ref ALL_LINTS: Vec = vec![ deprecation: None, module: "methods", }, - Lint { - name: "disallowed_name", - group: "style", - desc: "usage of a disallowed/placeholder name", - deprecation: None, - module: "disallowed_name", - }, Lint { name: "blanket_clippy_restriction_lints", group: "style", @@ -367,6 +360,13 @@ pub static ref ALL_LINTS: Vec = vec![ deprecation: None, module: "derive", }, + Lint { + name: "disallowed_name", + group: "style", + desc: "usage of a disallowed/placeholder name", + deprecation: None, + module: "disallowed_name", + }, Lint { name: "diverging_sub_expression", group: "complexity", From 472815130a1b388c2a87b9bae33655207cfe966d Mon Sep 17 00:00:00 2001 From: Andras Mocsary <425404+mocsy@users.noreply.github.com> Date: Tue, 18 Aug 2020 16:14:39 +0200 Subject: [PATCH 4/5] cargo dev fmt --- clippy_lints/src/utils/conf.rs | 3 ++- tests/ui/crashes/ice-2760.rs | 7 +------ tests/ui/let_if_seq.rs | 7 +------ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs index 73a85c879a1f..50c225fa8e6d 100644 --- a/clippy_lints/src/utils/conf.rs +++ b/clippy_lints/src/utils/conf.rs @@ -238,7 +238,8 @@ pub fn read(path: &Path) -> (Conf, Vec) { let block_ls_field = &toml_ref.blacklisted_names; if !block_ls_field.is_empty() { - let block_err = "found deprecated field `blacklisted-names`. Please use `disallowed-names` instead.".to_string(); + let block_err = + "found deprecated field `blacklisted-names`. Please use `disallowed-names` instead.".to_string(); errors.push(Error::Toml(block_err)); } diff --git a/tests/ui/crashes/ice-2760.rs b/tests/ui/crashes/ice-2760.rs index fd9e0e81f16d..89181d6bc62d 100644 --- a/tests/ui/crashes/ice-2760.rs +++ b/tests/ui/crashes/ice-2760.rs @@ -1,11 +1,6 @@ // run-pass -#![allow( - unused_variables, - clippy::disallowed_name, - clippy::needless_pass_by_value, - dead_code -)] +#![allow(unused_variables, clippy::disallowed_name, clippy::needless_pass_by_value, dead_code)] /// This should not compile-fail with: /// diff --git a/tests/ui/let_if_seq.rs b/tests/ui/let_if_seq.rs index dbf6bdc66b3c..685e63aaa15b 100644 --- a/tests/ui/let_if_seq.rs +++ b/tests/ui/let_if_seq.rs @@ -1,9 +1,4 @@ -#![allow( - unused_variables, - unused_assignments, - clippy::similar_names, - clippy::disallowed_name -)] +#![allow(unused_variables, unused_assignments, clippy::similar_names, clippy::disallowed_name)] #![warn(clippy::useless_let_if_seq)] fn f() -> bool { From 1d8dd5bc64e8a3a2d6ac64c29aa9aacd7314bead Mon Sep 17 00:00:00 2001 From: Andras Mocsary <425404+mocsy@users.noreply.github.com> Date: Mon, 24 Aug 2020 13:37:07 +0200 Subject: [PATCH 5/5] Fix tests --- clippy_lints/src/utils/conf.rs | 2 +- .../clippy.toml | 0 .../conf_french_disallowed_name.rs} | 0 .../conf_french_disallowed_name.stderr} | 0 .../toml_unknown_key/conf_unknown_key.stderr | 2 +- tests/ui/blacklisted_name.rs | 2 +- tests/ui/blacklisted_name.stderr | 92 ++----------------- tests/ui/disallowed_name.rs | 45 +++++++++ tests/ui/disallowed_name.stderr | 88 ++++++++++++++++++ tests/ui/let_if_seq.stderr | 8 +- 10 files changed, 150 insertions(+), 89 deletions(-) rename tests/ui-toml/{toml_blacklist => toml_disallowlist}/clippy.toml (100%) rename tests/ui-toml/{toml_blacklist/conf_french_blacklisted_name.rs => toml_disallowlist/conf_french_disallowed_name.rs} (100%) rename tests/ui-toml/{toml_blacklist/conf_french_blacklisted_name.stderr => toml_disallowlist/conf_french_disallowed_name.stderr} (100%) create mode 100644 tests/ui/disallowed_name.rs create mode 100644 tests/ui/disallowed_name.stderr diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs index 50c225fa8e6d..ce35a72f5224 100644 --- a/clippy_lints/src/utils/conf.rs +++ b/clippy_lints/src/utils/conf.rs @@ -107,7 +107,7 @@ macro_rules! define_Conf { pub use self::helpers::Conf; define_Conf! { /// DEPRECATED LINT: BLACKLISTED_NAME. Use the Disallowed Names lint instead. - (blacklisted_names, "blacklisted_names": Vec, ["foo", "baz", "quux"].iter().map(ToString::to_string).collect()), + (blacklisted_names, "blacklisted_names": Vec, vec![]), /// Lint: DISALLOWED_NAME. The list of disallowed names to lint about. NB: `bar` is not here since it has legitimate uses (disallowed_names, "disallowed_names": Vec, ["foo", "baz", "quux"].iter().map(ToString::to_string).collect()), /// Lint: COGNITIVE_COMPLEXITY. The maximum cognitive complexity a function can have diff --git a/tests/ui-toml/toml_blacklist/clippy.toml b/tests/ui-toml/toml_disallowlist/clippy.toml similarity index 100% rename from tests/ui-toml/toml_blacklist/clippy.toml rename to tests/ui-toml/toml_disallowlist/clippy.toml diff --git a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs b/tests/ui-toml/toml_disallowlist/conf_french_disallowed_name.rs similarity index 100% rename from tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.rs rename to tests/ui-toml/toml_disallowlist/conf_french_disallowed_name.rs diff --git a/tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr b/tests/ui-toml/toml_disallowlist/conf_french_disallowed_name.stderr similarity index 100% rename from tests/ui-toml/toml_blacklist/conf_french_blacklisted_name.stderr rename to tests/ui-toml/toml_disallowlist/conf_french_disallowed_name.stderr diff --git a/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr b/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr index 88e0bb50012f..d50940842389 100644 --- a/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr +++ b/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr @@ -1,4 +1,4 @@ -error: error reading Clippy's configuration file `$DIR/clippy.toml`: unknown field `foobar`, expected one of `disallowed-names`, `cognitive-complexity-threshold`, `cyclomatic-complexity-threshold`, `doc-valid-idents`, `too-many-arguments-threshold`, `type-complexity-threshold`, `single-char-binding-names-threshold`, `too-large-for-stack`, `enum-variant-name-threshold`, `enum-variant-size-threshold`, `verbose-bit-mask-threshold`, `literal-representation-threshold`, `trivial-copy-size-limit`, `too-many-lines-threshold`, `array-size-threshold`, `vec-box-size-threshold`, `max-trait-bounds`, `max-struct-bools`, `max-fn-params-bools`, `warn-on-all-wildcard-imports`, `third-party` at line 5 column 1 +error: error reading Clippy's configuration file `$DIR/clippy.toml`: unknown field `foobar`, expected one of `blacklisted-names`, `disallowed-names`, `cognitive-complexity-threshold`, `cyclomatic-complexity-threshold`, `doc-valid-idents`, `too-many-arguments-threshold`, `type-complexity-threshold`, `single-char-binding-names-threshold`, `too-large-for-stack`, `enum-variant-name-threshold`, `enum-variant-size-threshold`, `verbose-bit-mask-threshold`, `literal-representation-threshold`, `trivial-copy-size-limit`, `too-many-lines-threshold`, `array-size-threshold`, `vec-box-size-threshold`, `max-trait-bounds`, `max-struct-bools`, `max-fn-params-bools`, `warn-on-all-wildcard-imports`, `third-party` at line 5 column 1 error: aborting due to previous error diff --git a/tests/ui/blacklisted_name.rs b/tests/ui/blacklisted_name.rs index cbcf680d1815..cb15bdd2f1b2 100644 --- a/tests/ui/blacklisted_name.rs +++ b/tests/ui/blacklisted_name.rs @@ -6,7 +6,7 @@ unused_mut, unused_variables )] -#![warn(clippy::disallowed_name)] +#![warn(clippy::blacklisted_name)] fn test(foo: ()) {} diff --git a/tests/ui/blacklisted_name.stderr b/tests/ui/blacklisted_name.stderr index 240c167e2234..4b72f802cd4d 100644 --- a/tests/ui/blacklisted_name.stderr +++ b/tests/ui/blacklisted_name.stderr @@ -1,88 +1,16 @@ -error: use of a disallowed/placeholder name `foo` - --> $DIR/disallowed_name.rs:11:9 +error: lint `clippy::blacklisted_name` has been renamed to `clippy::disallowed_name` + --> $DIR/blacklisted_name.rs:9:9 | -LL | fn test(foo: ()) {} - | ^^^ +LL | #![warn(clippy::blacklisted_name)] + | ^^^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `clippy::disallowed_name` | - = note: `-D clippy::disallowed-name` implied by `-D warnings` + = note: `-D renamed-and-removed-lints` implied by `-D warnings` -error: use of a disallowed/placeholder name `foo` - --> $DIR/disallowed_name.rs:14:9 +error: lint `clippy::blacklisted_name` has been renamed to `clippy::disallowed_name` + --> $DIR/blacklisted_name.rs:9:9 | -LL | let foo = 42; - | ^^^ +LL | #![warn(clippy::blacklisted_name)] + | ^^^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `clippy::disallowed_name` -error: use of a disallowed/placeholder name `baz` - --> $DIR/disallowed_name.rs:15:9 - | -LL | let baz = 42; - | ^^^ - -error: use of a disallowed/placeholder name `quux` - --> $DIR/disallowed_name.rs:16:9 - | -LL | let quux = 42; - | ^^^^ - -error: use of a disallowed/placeholder name `foo` - --> $DIR/disallowed_name.rs:27:10 - | -LL | (foo, Some(baz), quux @ Some(_)) => (), - | ^^^ - -error: use of a disallowed/placeholder name `baz` - --> $DIR/disallowed_name.rs:27:20 - | -LL | (foo, Some(baz), quux @ Some(_)) => (), - | ^^^ - -error: use of a disallowed/placeholder name `quux` - --> $DIR/disallowed_name.rs:27:26 - | -LL | (foo, Some(baz), quux @ Some(_)) => (), - | ^^^^ - -error: use of a disallowed/placeholder name `foo` - --> $DIR/disallowed_name.rs:32:19 - | -LL | fn issue_1647(mut foo: u8) { - | ^^^ - -error: use of a disallowed/placeholder name `baz` - --> $DIR/disallowed_name.rs:33:13 - | -LL | let mut baz = 0; - | ^^^ - -error: use of a disallowed/placeholder name `quux` - --> $DIR/disallowed_name.rs:34:21 - | -LL | if let Some(mut quux) = Some(42) {} - | ^^^^ - -error: use of a disallowed/placeholder name `baz` - --> $DIR/disallowed_name.rs:38:13 - | -LL | let ref baz = 0; - | ^^^ - -error: use of a disallowed/placeholder name `quux` - --> $DIR/disallowed_name.rs:39:21 - | -LL | if let Some(ref quux) = Some(42) {} - | ^^^^ - -error: use of a disallowed/placeholder name `baz` - --> $DIR/disallowed_name.rs:43:17 - | -LL | let ref mut baz = 0; - | ^^^ - -error: use of a disallowed/placeholder name `quux` - --> $DIR/disallowed_name.rs:44:25 - | -LL | if let Some(ref mut quux) = Some(42) {} - | ^^^^ - -error: aborting due to 14 previous errors +error: aborting due to 2 previous errors diff --git a/tests/ui/disallowed_name.rs b/tests/ui/disallowed_name.rs new file mode 100644 index 000000000000..cbcf680d1815 --- /dev/null +++ b/tests/ui/disallowed_name.rs @@ -0,0 +1,45 @@ +#![allow( + dead_code, + clippy::similar_names, + clippy::single_match, + clippy::toplevel_ref_arg, + unused_mut, + unused_variables +)] +#![warn(clippy::disallowed_name)] + +fn test(foo: ()) {} + +fn main() { + let foo = 42; + let baz = 42; + let quux = 42; + // Unlike these others, `bar` is actually considered an acceptable name. + // Among many other legitimate uses, bar commonly refers to a period of time in music. + // See https://github.com/rust-lang/rust-clippy/issues/5225. + let bar = 42; + + let food = 42; + let foodstuffs = 42; + let bazaar = 42; + + match (42, Some(1337), Some(0)) { + (foo, Some(baz), quux @ Some(_)) => (), + _ => (), + } +} + +fn issue_1647(mut foo: u8) { + let mut baz = 0; + if let Some(mut quux) = Some(42) {} +} + +fn issue_1647_ref() { + let ref baz = 0; + if let Some(ref quux) = Some(42) {} +} + +fn issue_1647_ref_mut() { + let ref mut baz = 0; + if let Some(ref mut quux) = Some(42) {} +} diff --git a/tests/ui/disallowed_name.stderr b/tests/ui/disallowed_name.stderr new file mode 100644 index 000000000000..240c167e2234 --- /dev/null +++ b/tests/ui/disallowed_name.stderr @@ -0,0 +1,88 @@ +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:11:9 + | +LL | fn test(foo: ()) {} + | ^^^ + | + = note: `-D clippy::disallowed-name` implied by `-D warnings` + +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:14:9 + | +LL | let foo = 42; + | ^^^ + +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:15:9 + | +LL | let baz = 42; + | ^^^ + +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:16:9 + | +LL | let quux = 42; + | ^^^^ + +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:27:10 + | +LL | (foo, Some(baz), quux @ Some(_)) => (), + | ^^^ + +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:27:20 + | +LL | (foo, Some(baz), quux @ Some(_)) => (), + | ^^^ + +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:27:26 + | +LL | (foo, Some(baz), quux @ Some(_)) => (), + | ^^^^ + +error: use of a disallowed/placeholder name `foo` + --> $DIR/disallowed_name.rs:32:19 + | +LL | fn issue_1647(mut foo: u8) { + | ^^^ + +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:33:13 + | +LL | let mut baz = 0; + | ^^^ + +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:34:21 + | +LL | if let Some(mut quux) = Some(42) {} + | ^^^^ + +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:38:13 + | +LL | let ref baz = 0; + | ^^^ + +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:39:21 + | +LL | if let Some(ref quux) = Some(42) {} + | ^^^^ + +error: use of a disallowed/placeholder name `baz` + --> $DIR/disallowed_name.rs:43:17 + | +LL | let ref mut baz = 0; + | ^^^ + +error: use of a disallowed/placeholder name `quux` + --> $DIR/disallowed_name.rs:44:25 + | +LL | if let Some(ref mut quux) = Some(42) {} + | ^^^^ + +error: aborting due to 14 previous errors + diff --git a/tests/ui/let_if_seq.stderr b/tests/ui/let_if_seq.stderr index c53a63a541bc..abb2aac67717 100644 --- a/tests/ui/let_if_seq.stderr +++ b/tests/ui/let_if_seq.stderr @@ -1,5 +1,5 @@ error: `if _ { .. } else { .. }` is an expression - --> $DIR/let_if_seq.rs:63:5 + --> $DIR/let_if_seq.rs:58:5 | LL | / let mut foo = 0; LL | | if f() { @@ -11,7 +11,7 @@ LL | | } = note: you might not need `mut` at all error: `if _ { .. } else { .. }` is an expression - --> $DIR/let_if_seq.rs:68:5 + --> $DIR/let_if_seq.rs:63:5 | LL | / let mut bar = 0; LL | | if f() { @@ -25,7 +25,7 @@ LL | | } = note: you might not need `mut` at all error: `if _ { .. } else { .. }` is an expression - --> $DIR/let_if_seq.rs:76:5 + --> $DIR/let_if_seq.rs:71:5 | LL | / let quz; LL | | if f() { @@ -36,7 +36,7 @@ LL | | } | |_____^ help: it is more idiomatic to write: `let quz = if f() { 42 } else { 0 };` error: `if _ { .. } else { .. }` is an expression - --> $DIR/let_if_seq.rs:105:5 + --> $DIR/let_if_seq.rs:100:5 | LL | / let mut baz = 0; LL | | if f() {