about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-03-25 17:21:15 +0000
committerbors <bors@rust-lang.org>2020-03-25 17:21:15 +0000
commit5de8c101e50749aea4ebee4a7c8c6beb007d0be4 (patch)
tree77567d715dd6ec816fc82b49fb2d914f01e0453f
parentd3e21fe690640430fc6e2da8d1c0fae9c3f2bea7 (diff)
parentb86e8434df5688d68d84434f25e7dacbe8a9247b (diff)
downloadrust-5de8c101e50749aea4ebee4a7c8c6beb007d0be4.tar.gz
rust-5de8c101e50749aea4ebee4a7c8c6beb007d0be4.zip
Auto merge of #5372 - matthiaskrgr:rpc_nursery, r=flip1995
move redundant_pub_crate to nursery

cc #5369
changelog: none
-rw-r--r--clippy_lints/src/lib.rs3
-rw-r--r--clippy_lints/src/redundant_pub_crate.rs2
-rw-r--r--src/lintlist/mod.rs2
-rw-r--r--tests/ui/wildcard_imports.fixed2
-rw-r--r--tests/ui/wildcard_imports.rs2
5 files changed, 5 insertions, 6 deletions
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index e66006ac167..b701f4fee31 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -1325,7 +1325,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
         LintId::of(&redundant_clone::REDUNDANT_CLONE),
         LintId::of(&redundant_field_names::REDUNDANT_FIELD_NAMES),
         LintId::of(&redundant_pattern_matching::REDUNDANT_PATTERN_MATCHING),
-        LintId::of(&redundant_pub_crate::REDUNDANT_PUB_CRATE),
         LintId::of(&redundant_static_lifetimes::REDUNDANT_STATIC_LIFETIMES),
         LintId::of(&reference::DEREF_ADDROF),
         LintId::of(&reference::REF_IN_DEREF),
@@ -1466,7 +1465,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
         LintId::of(&question_mark::QUESTION_MARK),
         LintId::of(&redundant_field_names::REDUNDANT_FIELD_NAMES),
         LintId::of(&redundant_pattern_matching::REDUNDANT_PATTERN_MATCHING),
-        LintId::of(&redundant_pub_crate::REDUNDANT_PUB_CRATE),
         LintId::of(&redundant_static_lifetimes::REDUNDANT_STATIC_LIFETIMES),
         LintId::of(&regex::REGEX_MACRO),
         LintId::of(&regex::TRIVIAL_REGEX),
@@ -1673,6 +1671,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
         LintId::of(&mutex_atomic::MUTEX_INTEGER),
         LintId::of(&needless_borrow::NEEDLESS_BORROW),
         LintId::of(&path_buf_push_overwrite::PATH_BUF_PUSH_OVERWRITE),
+        LintId::of(&redundant_pub_crate::REDUNDANT_PUB_CRATE),
         LintId::of(&transmute::USELESS_TRANSMUTE),
         LintId::of(&use_self::USE_SELF),
     ]);
diff --git a/clippy_lints/src/redundant_pub_crate.rs b/clippy_lints/src/redundant_pub_crate.rs
index af4ab367f5f..b54d0b0c9a1 100644
--- a/clippy_lints/src/redundant_pub_crate.rs
+++ b/clippy_lints/src/redundant_pub_crate.rs
@@ -28,7 +28,7 @@ declare_clippy_lint! {
     /// }
     /// ```
     pub REDUNDANT_PUB_CRATE,
-    style,
+    nursery,
     "Using `pub(crate)` visibility on items that are not crate visible due to the visibility of the module that contains them."
 }
 
diff --git a/src/lintlist/mod.rs b/src/lintlist/mod.rs
index a17de3e216b..0cf094b8ed3 100644
--- a/src/lintlist/mod.rs
+++ b/src/lintlist/mod.rs
@@ -1766,7 +1766,7 @@ pub const ALL_LINTS: [Lint; 362] = [
     },
     Lint {
         name: "redundant_pub_crate",
-        group: "style",
+        group: "nursery",
         desc: "Using `pub(crate)` visibility on items that are not crate visible due to the visibility of the module that contains them.",
         deprecation: None,
         module: "redundant_pub_crate",
diff --git a/tests/ui/wildcard_imports.fixed b/tests/ui/wildcard_imports.fixed
index 69ab6e1f8c1..ed6cc00ef04 100644
--- a/tests/ui/wildcard_imports.fixed
+++ b/tests/ui/wildcard_imports.fixed
@@ -2,7 +2,7 @@
 // aux-build:wildcard_imports_helper.rs
 
 #![warn(clippy::wildcard_imports)]
-#![allow(clippy::redundant_pub_crate)]
+//#![allow(clippy::redundant_pub_crate)]
 #![allow(unused)]
 #![warn(unused_imports)]
 
diff --git a/tests/ui/wildcard_imports.rs b/tests/ui/wildcard_imports.rs
index e64ac4ce519..c6d6efaece8 100644
--- a/tests/ui/wildcard_imports.rs
+++ b/tests/ui/wildcard_imports.rs
@@ -2,7 +2,7 @@
 // aux-build:wildcard_imports_helper.rs
 
 #![warn(clippy::wildcard_imports)]
-#![allow(clippy::redundant_pub_crate)]
+//#![allow(clippy::redundant_pub_crate)]
 #![allow(unused)]
 #![warn(unused_imports)]