Skip to content

Commit 5de8c10

Browse files
committed
Auto merge of rust-lang#5372 - matthiaskrgr:rpc_nursery, r=flip1995
move redundant_pub_crate to nursery cc rust-lang#5369 changelog: none
2 parents d3e21fe + b86e843 commit 5de8c10

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

clippy_lints/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
13251325
LintId::of(&redundant_clone::REDUNDANT_CLONE),
13261326
LintId::of(&redundant_field_names::REDUNDANT_FIELD_NAMES),
13271327
LintId::of(&redundant_pattern_matching::REDUNDANT_PATTERN_MATCHING),
1328-
LintId::of(&redundant_pub_crate::REDUNDANT_PUB_CRATE),
13291328
LintId::of(&redundant_static_lifetimes::REDUNDANT_STATIC_LIFETIMES),
13301329
LintId::of(&reference::DEREF_ADDROF),
13311330
LintId::of(&reference::REF_IN_DEREF),
@@ -1466,7 +1465,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
14661465
LintId::of(&question_mark::QUESTION_MARK),
14671466
LintId::of(&redundant_field_names::REDUNDANT_FIELD_NAMES),
14681467
LintId::of(&redundant_pattern_matching::REDUNDANT_PATTERN_MATCHING),
1469-
LintId::of(&redundant_pub_crate::REDUNDANT_PUB_CRATE),
14701468
LintId::of(&redundant_static_lifetimes::REDUNDANT_STATIC_LIFETIMES),
14711469
LintId::of(&regex::REGEX_MACRO),
14721470
LintId::of(&regex::TRIVIAL_REGEX),
@@ -1673,6 +1671,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
16731671
LintId::of(&mutex_atomic::MUTEX_INTEGER),
16741672
LintId::of(&needless_borrow::NEEDLESS_BORROW),
16751673
LintId::of(&path_buf_push_overwrite::PATH_BUF_PUSH_OVERWRITE),
1674+
LintId::of(&redundant_pub_crate::REDUNDANT_PUB_CRATE),
16761675
LintId::of(&transmute::USELESS_TRANSMUTE),
16771676
LintId::of(&use_self::USE_SELF),
16781677
]);

clippy_lints/src/redundant_pub_crate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ declare_clippy_lint! {
2828
/// }
2929
/// ```
3030
pub REDUNDANT_PUB_CRATE,
31-
style,
31+
nursery,
3232
"Using `pub(crate)` visibility on items that are not crate visible due to the visibility of the module that contains them."
3333
}
3434

src/lintlist/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ pub const ALL_LINTS: [Lint; 362] = [
17661766
},
17671767
Lint {
17681768
name: "redundant_pub_crate",
1769-
group: "style",
1769+
group: "nursery",
17701770
desc: "Using `pub(crate)` visibility on items that are not crate visible due to the visibility of the module that contains them.",
17711771
deprecation: None,
17721772
module: "redundant_pub_crate",

tests/ui/wildcard_imports.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// aux-build:wildcard_imports_helper.rs
33

44
#![warn(clippy::wildcard_imports)]
5-
#![allow(clippy::redundant_pub_crate)]
5+
//#![allow(clippy::redundant_pub_crate)]
66
#![allow(unused)]
77
#![warn(unused_imports)]
88

tests/ui/wildcard_imports.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// aux-build:wildcard_imports_helper.rs
33

44
#![warn(clippy::wildcard_imports)]
5-
#![allow(clippy::redundant_pub_crate)]
5+
//#![allow(clippy::redundant_pub_crate)]
66
#![allow(unused)]
77
#![warn(unused_imports)]
88

0 commit comments

Comments
 (0)