Skip to content

Commit

Permalink
Auto merge of rust-lang#5442 - rust-lang:revert-5420-newret, r=Manish…
Browse files Browse the repository at this point in the history
…earth

Revert "Downgrade new_ret_no_self to pedantic"

Reverts rust-lang#5420

This got through with the big rollup merge, where I didn't recheck every PR of the rollup. Reverting because of the reason given in rust-lang#5420 (comment) by @joshtriplett

changelog: Move new_ret_no_self back to style category
  • Loading branch information
bors committed Apr 9, 2020
2 parents c25f26d + 90fb50f commit 34763a5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion clippy_lints/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
LintId::of(&methods::FIND_MAP),
LintId::of(&methods::INEFFICIENT_TO_STRING),
LintId::of(&methods::MAP_FLATTEN),
LintId::of(&methods::NEW_RET_NO_SELF),
LintId::of(&methods::OPTION_MAP_UNWRAP_OR),
LintId::of(&methods::OPTION_MAP_UNWRAP_OR_ELSE),
LintId::of(&methods::RESULT_MAP_UNWRAP_OR_ELSE),
Expand Down Expand Up @@ -1277,6 +1276,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
LintId::of(&methods::ITER_NTH_ZERO),
LintId::of(&methods::ITER_SKIP_NEXT),
LintId::of(&methods::MANUAL_SATURATING_ARITHMETIC),
LintId::of(&methods::NEW_RET_NO_SELF),
LintId::of(&methods::OK_EXPECT),
LintId::of(&methods::OPTION_AND_THEN_SOME),
LintId::of(&methods::OPTION_AS_REF_DEREF),
Expand Down Expand Up @@ -1456,6 +1456,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
LintId::of(&methods::ITER_NTH_ZERO),
LintId::of(&methods::ITER_SKIP_NEXT),
LintId::of(&methods::MANUAL_SATURATING_ARITHMETIC),
LintId::of(&methods::NEW_RET_NO_SELF),
LintId::of(&methods::OK_EXPECT),
LintId::of(&methods::OPTION_MAP_OR_NONE),
LintId::of(&methods::RESULT_MAP_OR_INTO_OPTION),
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/methods/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ declare_clippy_lint! {
/// }
/// ```
pub NEW_RET_NO_SELF,
pedantic,
style,
"not returning `Self` in a `new` method"
}

Expand Down
2 changes: 1 addition & 1 deletion src/lintlist/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@ pub static ref ALL_LINTS: Vec<Lint> = vec![
},
Lint {
name: "new_ret_no_self",
group: "pedantic",
group: "style",
desc: "not returning `Self` in a `new` method",
deprecation: None,
module: "methods",
Expand Down

0 comments on commit 34763a5

Please sign in to comment.