diff options
| author | bors <bors@rust-lang.org> | 2022-05-18 01:29:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-18 01:29:06 +0000 |
| commit | fe5b13d681f25ee6474be29d748c65adcd91f69e (patch) | |
| tree | 56b1e33ee9a1b0cb249ff75194362a2bbe98a7e4 /src/tools | |
| parent | 66a356df851ab925a35d01b65d669348b5113fa3 (diff) | |
| parent | f9567f1b0ff625faf8c685790f0b2fe9005434ce (diff) | |
| download | rust-1.61.0.tar.gz rust-1.61.0.zip | |
Auto merge of #97128 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.61.0
[stable] 1.61 stable rebuild * New version of release notes (from as-yet unmerged https://github.com/rust-lang/rust/pull/96539) * Manual patch to drop clippy's needless_match lint to nursery, per [discussion on Zulip](https://rust-lang.zulipchat.com/#narrow/stream/241545-t-release/topic/release.201.2E61.2E0/near/282717457) r? `@Mark-Simulacrum`
Diffstat (limited to 'src/tools')
4 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/clippy/clippy_lints/src/lib.register_all.rs b/src/tools/clippy/clippy_lints/src/lib.register_all.rs index 4cd19d99c08..6eaee745e10 100644 --- a/src/tools/clippy/clippy_lints/src/lib.register_all.rs +++ b/src/tools/clippy/clippy_lints/src/lib.register_all.rs @@ -139,7 +139,6 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![ LintId::of(matches::MATCH_OVERLAPPING_ARM), LintId::of(matches::MATCH_REF_PATS), LintId::of(matches::MATCH_SINGLE_BINDING), - LintId::of(matches::NEEDLESS_MATCH), LintId::of(matches::REDUNDANT_PATTERN_MATCHING), LintId::of(matches::SINGLE_MATCH), LintId::of(matches::WILDCARD_IN_OR_PATTERNS), diff --git a/src/tools/clippy/clippy_lints/src/lib.register_complexity.rs b/src/tools/clippy/clippy_lints/src/lib.register_complexity.rs index 24658f02b05..755fb901e7d 100644 --- a/src/tools/clippy/clippy_lints/src/lib.register_complexity.rs +++ b/src/tools/clippy/clippy_lints/src/lib.register_complexity.rs @@ -30,7 +30,6 @@ store.register_group(true, "clippy::complexity", Some("clippy_complexity"), vec! LintId::of(map_unit_fn::RESULT_MAP_UNIT_FN), LintId::of(matches::MATCH_AS_REF), LintId::of(matches::MATCH_SINGLE_BINDING), - LintId::of(matches::NEEDLESS_MATCH), LintId::of(matches::WILDCARD_IN_OR_PATTERNS), LintId::of(methods::BIND_INSTEAD_OF_MAP), LintId::of(methods::CLONE_ON_COPY), diff --git a/src/tools/clippy/clippy_lints/src/lib.register_nursery.rs b/src/tools/clippy/clippy_lints/src/lib.register_nursery.rs index 18904a94538..73c227cf97f 100644 --- a/src/tools/clippy/clippy_lints/src/lib.register_nursery.rs +++ b/src/tools/clippy/clippy_lints/src/lib.register_nursery.rs @@ -13,6 +13,7 @@ store.register_group(true, "clippy::nursery", Some("clippy_nursery"), vec![ LintId::of(future_not_send::FUTURE_NOT_SEND), LintId::of(index_refutable_slice::INDEX_REFUTABLE_SLICE), LintId::of(let_if_seq::USELESS_LET_IF_SEQ), + LintId::of(matches::NEEDLESS_MATCH), LintId::of(methods::ITER_WITH_DRAIN), LintId::of(missing_const_for_fn::MISSING_CONST_FOR_FN), LintId::of(mutable_debug_assertion::DEBUG_ASSERT_WITH_MUT_CALL), diff --git a/src/tools/clippy/clippy_lints/src/matches/mod.rs b/src/tools/clippy/clippy_lints/src/matches/mod.rs index ff85623acf4..aaffaa7ad61 100644 --- a/src/tools/clippy/clippy_lints/src/matches/mod.rs +++ b/src/tools/clippy/clippy_lints/src/matches/mod.rs @@ -606,7 +606,7 @@ declare_clippy_lint! { /// ``` #[clippy::version = "1.61.0"] pub NEEDLESS_MATCH, - complexity, + nursery, "`match` or match-like `if let` that are unnecessary" } |