diff options
| author | Jason Newcomb <jsnewcomb@pm.me> | 2021-02-26 16:27:41 -0500 |
|---|---|---|
| committer | Jason Newcomb <jsnewcomb@pm.me> | 2021-02-26 16:27:41 -0500 |
| commit | 09a827ac735b138a06f3ac140a1c465b05a92ed1 (patch) | |
| tree | 9337df5bc58eefc69bca2c298487a089c118fc1b | |
| parent | ef87e58993ace9e607a43b5581d40b4c0a2e71f6 (diff) | |
| download | rust-09a827ac735b138a06f3ac140a1c465b05a92ed1.tar.gz rust-09a827ac735b138a06f3ac140a1c465b05a92ed1.zip | |
Revert #6796: Downgrade manual_map to nursery
| -rw-r--r-- | clippy_lints/src/lib.rs | 3 | ||||
| -rw-r--r-- | clippy_lints/src/manual_map.rs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index faec9ec31f3..176eeadcc63 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -1540,6 +1540,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&loops::WHILE_LET_ON_ITERATOR), LintId::of(&main_recursion::MAIN_RECURSION), LintId::of(&manual_async_fn::MANUAL_ASYNC_FN), + LintId::of(&manual_map::MANUAL_MAP), LintId::of(&manual_non_exhaustive::MANUAL_NON_EXHAUSTIVE), LintId::of(&manual_strip::MANUAL_STRIP), LintId::of(&manual_unwrap_or::MANUAL_UNWRAP_OR), @@ -1770,6 +1771,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&loops::WHILE_LET_ON_ITERATOR), LintId::of(&main_recursion::MAIN_RECURSION), LintId::of(&manual_async_fn::MANUAL_ASYNC_FN), + LintId::of(&manual_map::MANUAL_MAP), LintId::of(&manual_non_exhaustive::MANUAL_NON_EXHAUSTIVE), LintId::of(&map_clone::MAP_CLONE), LintId::of(&matches::INFALLIBLE_DESTRUCTURING_MATCH), @@ -2045,7 +2047,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf: LintId::of(&floating_point_arithmetic::SUBOPTIMAL_FLOPS), LintId::of(&future_not_send::FUTURE_NOT_SEND), LintId::of(&let_if_seq::USELESS_LET_IF_SEQ), - LintId::of(&manual_map::MANUAL_MAP), LintId::of(&missing_const_for_fn::MISSING_CONST_FOR_FN), LintId::of(&mutable_debug_assertion::DEBUG_ASSERT_WITH_MUT_CALL), LintId::of(&mutex_atomic::MUTEX_INTEGER), diff --git a/clippy_lints/src/manual_map.rs b/clippy_lints/src/manual_map.rs index bc6544ee79e..e6e70004527 100644 --- a/clippy_lints/src/manual_map.rs +++ b/clippy_lints/src/manual_map.rs @@ -23,7 +23,7 @@ declare_clippy_lint! { /// /// **Why is this bad?** Using the `map` method is clearer and more concise. /// - /// **Known problems:** `map` is not capable of representing some control flow which works fine in `match`. + /// **Known problems:** None. /// /// **Example:** /// @@ -38,7 +38,7 @@ declare_clippy_lint! { /// Some(0).map(|x| x + 1); /// ``` pub MANUAL_MAP, - nursery, + style, "reimplementation of `map`" } |