mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #6290 - alex-700:fix-match-like-matches, r=flip1995

Browse Source 
do not trigger MATCH_LIKE_MATCHES_MACRO lint with attrs

fixed #6289
changelog: do not trigger MATCH_LIKE_MATCHES_MACRO lint for arms with attrs
This commit is contained in:
bors 2020-11-28 21:58:07 +00:00
commit b62773114b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clippy_lints/src/matches.rs
View File

@ -459,7 +459,8 @@ declare_clippy_lint! {
/// ///
/// **Why is this bad?** Readability and needless complexity. /// **Why is this bad?** Readability and needless complexity.
/// ///
/// **Known problems:** None /// **Known problems:** This lint falsely triggers, if there are arms with
/// `cfg` attributes that remove an arm evaluating to `false`.
/// ///
/// **Example:** /// **Example:**
/// ```rust /// ```rust
@ -1167,13 +1168,16 @@ fn find_matches_sugg(cx: &LateContext<'_>, ex: &Expr<'_>, arms: &[Arm<'_>], expr
if b0 != b1; if b0 != b1;
let if_guard = &b0_arms[0].guard; let if_guard = &b0_arms[0].guard;
if if_guard.is_none() || b0_arms.len() == 1; if if_guard.is_none() || b0_arms.len() == 1;
if b0_arms[0].attrs.is_empty();
if b0_arms[1..].iter() if b0_arms[1..].iter()
.all(|arm| { .all(|arm| {
find_bool_lit(&arm.body.kind, desugared).map_or(false, |b| b == b0) && find_bool_lit(&arm.body.kind, desugared).map_or(false, |b| b == b0) &&
arm.guard.is_none() arm.guard.is_none() && arm.attrs.is_empty()
}); });
then { then {
let mut applicability = Applicability::MachineApplicable; // The suggestion may be incorrect, because some arms can have `cfg` attributes
// evaluated into `false` and so such arms will be stripped before.
let mut applicability = Applicability::MaybeIncorrect;
let pat = { let pat = {
use itertools::Itertools as _; use itertools::Itertools as _;
b0_arms.iter() b0_arms.iter()