Rename lint to MODULE_NAME_REPETITIONS

5 files changed, 20 insertions, 15 deletions

diff --git a/clippy_lints/src/enum_variants.rs b/clippy_lints/src/enum_variants.rs
index 861e1177296..c6142a16854 100644
--- a/clippy_lints/src/enum_variants.rs
+++ b/clippy_lints/src/enum_variants.rs
@@ -75,7 +75,7 @@ declare_clippy_lint! {
 /// }
 /// ```
 declare_clippy_lint! {
-    pub MODULE_NAME_REPEAT,
+    pub MODULE_NAME_REPETITIONS,
     pedantic,
     "type names prefixed/postfixed with their containing module's name"
 }
@@ -126,7 +126,12 @@ impl EnumVariantNames {
 
 impl LintPass for EnumVariantNames {
     fn get_lints(&self) -> LintArray {
-        lint_array!(ENUM_VARIANT_NAMES, PUB_ENUM_VARIANT_NAMES, MODULE_NAME_REPEAT, MODULE_INCEPTION)
+        lint_array!(
+            ENUM_VARIANT_NAMES,
+            PUB_ENUM_VARIANT_NAMES,
+            MODULE_NAME_REPETITIONS,
+            MODULE_INCEPTION
+        )
     }
 }
 
@@ -277,7 +282,7 @@ impl EarlyLintPass for EnumVariantNames {
                             match item_camel.chars().nth(nchars) {
                                 Some(c) if is_word_beginning(c) => span_lint(
                                     cx,
-                                    MODULE_NAME_REPEAT,
+                                    MODULE_NAME_REPETITIONS,
                                     item.span,
                                     "item name starts with its containing module's name",
                                 ),
@@ -287,7 +292,7 @@ impl EarlyLintPass for EnumVariantNames {
                         if rmatching == nchars {
                             span_lint(
                                 cx,
-                                MODULE_NAME_REPEAT,
+                                MODULE_NAME_REPETITIONS,
                                 item.span,
                                 "item name ends with its containing module's name",
                             );
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 5c1469536f5..8ce5861a939 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -517,7 +517,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
         doc::DOC_MARKDOWN,
         empty_enum::EMPTY_ENUM,
         enum_glob_use::ENUM_GLOB_USE,
-        enum_variants::MODULE_NAME_REPEAT,
+        enum_variants::MODULE_NAME_REPETITIONS,
         enum_variants::PUB_ENUM_VARIANT_NAMES,
         if_not_else::IF_NOT_ELSE,
         infinite_iter::MAYBE_INFINITE_ITER,
@@ -1031,7 +1031,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
 }
 
 pub fn register_renamed(ls: &mut rustc::lint::LintStore) {
-    ls.register_renamed("clippy::stutter", "clippy::module_name_repeat");
+    ls.register_renamed("clippy::stutter", "clippy::module_name_repetitions");
 }
 
 // only exists to let the dogfood integration test works.
diff --git a/tests/ui/module_name_repeat.rs b/tests/ui/module_name_repetitions.rs
index a302eaacccf..4db4f56de46 100644
--- a/tests/ui/module_name_repeat.rs
+++ b/tests/ui/module_name_repetitions.rs
@@ -7,7 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![warn(clippy::module_name_repeat)]
+#![warn(clippy::module_name_repetitions)]
 #![allow(dead_code)]
 
 mod foo {
diff --git a/tests/ui/module_name_repeat.stderr b/tests/ui/module_name_repetitions.stderr
index 9547fa9fdd6..e2eca64ba42 100644
--- a/tests/ui/module_name_repeat.stderr
+++ b/tests/ui/module_name_repetitions.stderr
@@ -1,31 +1,31 @@
 error: item name starts with its containing module's name
-  --> $DIR/module_name_repeat.rs:15:5
+  --> $DIR/module_name_repetitions.rs:15:5
    |
 15 |     pub fn foo_bar() {}
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: `-D clippy::module-name-repeat` implied by `-D warnings`
+   = note: `-D clippy::module-name-repetitions` implied by `-D warnings`
 
 error: item name ends with its containing module's name
-  --> $DIR/module_name_repeat.rs:16:5
+  --> $DIR/module_name_repetitions.rs:16:5
    |
 16 |     pub fn bar_foo() {}
    |     ^^^^^^^^^^^^^^^^^^^
 
 error: item name starts with its containing module's name
-  --> $DIR/module_name_repeat.rs:17:5
+  --> $DIR/module_name_repetitions.rs:17:5
    |
 17 |     pub struct FooCake {}
    |     ^^^^^^^^^^^^^^^^^^^^^
 
 error: item name ends with its containing module's name
-  --> $DIR/module_name_repeat.rs:18:5
+  --> $DIR/module_name_repetitions.rs:18:5
    |
 18 |     pub enum CakeFoo {}
    |     ^^^^^^^^^^^^^^^^^^^
 
 error: item name starts with its containing module's name
-  --> $DIR/module_name_repeat.rs:19:5
+  --> $DIR/module_name_repetitions.rs:19:5
    |
 19 |     pub struct Foo7Bar;
    |     ^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/rename.stderr b/tests/ui/rename.stderr
index 9aa22eb6c45..7ad8228fb35 100644
--- a/tests/ui/rename.stderr
+++ b/tests/ui/rename.stderr
@@ -6,11 +6,11 @@ error: unknown lint: `stutter`
    |
    = note: `-D unknown-lints` implied by `-D warnings`
 
-error: lint `clippy::stutter` has been renamed to `clippy::module_name_repeat`
+error: lint `clippy::stutter` has been renamed to `clippy::module_name_repetitions`
   --> $DIR/rename.rs:12:8
    |
 12 | #[warn(clippy::stutter)]
-   |        ^^^^^^^^^^^^^^^ help: use the new name: `clippy::module_name_repeat`
+   |        ^^^^^^^^^^^^^^^ help: use the new name: `clippy::module_name_repetitions`
    |
    = note: `-D renamed-and-removed-lints` implied by `-D warnings`