Lint rename and utils/conf rename

Author: mocsy

clippy_lints/src/blacklisted_name.rs renamed to clippy_lints/src/disallowed_name.rs

@@ -23,19 +23,19 @@ declare_clippy_lint! {
 }
 
 #[derive(Clone, Debug)]
-pub struct DisAllowedName {
+pub struct DisallowedName {
     disallowlist: FxHashSet<String>,
 }
 
-impl DisAllowedName {
+impl DisallowedName {
     pub fn new(disallowlist: FxHashSet<String>) -> 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()) {

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::<FxHashSet<_>>();
-    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.

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<String>, ["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<String>, ["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<Error>) {
                 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) => {