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

Fix formatting of if let chain

Browse Source
This commit is contained in:
est31 2023-05-18 07:56:04 +02:00
parent cf182b9f43
commit 83a4b0987f
1 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
clippy_lints/src/manual_let_else.rs
View File

@ -77,53 +77,54 @@ impl<'tcx> LateLintPass<'tcx> for ManualLetElse {
local.els.is_none() && local.els.is_none() &&
local.ty.is_none() && local.ty.is_none() &&
init.span.ctxt() == stmt.span.ctxt() && init.span.ctxt() == stmt.span.ctxt() &&
let Some(if_let_or_match) = IfLetOrMatch::parse(cx, init) { let Some(if_let_or_match) = IfLetOrMatch::parse(cx, init)
match if_let_or_match { {
IfLetOrMatch::IfLet(if_let_expr, let_pat, if_then, if_else) => if_chain! { match if_let_or_match {
if expr_is_simple_identity(let_pat, if_then); IfLetOrMatch::IfLet(if_let_expr, let_pat, if_then, if_else) => if_chain! {
if let Some(if_else) = if_else; if expr_is_simple_identity(let_pat, if_then);
if expr_diverges(cx, if_else); if let Some(if_else) = if_else;
then { if expr_diverges(cx, if_else);
emit_manual_let_else(cx, stmt.span, if_let_expr, local.pat, let_pat, if_else); then {
} emit_manual_let_else(cx, stmt.span, if_let_expr, local.pat, let_pat, if_else);
}, }
IfLetOrMatch::Match(match_expr, arms, source) => { },
if self.matches_behaviour == MatchLintBehaviour::Never { IfLetOrMatch::Match(match_expr, arms, source) => {
return; if self.matches_behaviour == MatchLintBehaviour::Never {
} return;
if source != MatchSource::Normal { }
return; if source != MatchSource::Normal {
} return;
// Any other number than two arms doesn't (necessarily) }
// have a trivial mapping to let else. // Any other number than two arms doesn't (necessarily)
if arms.len() != 2 { // have a trivial mapping to let else.
return; if arms.len() != 2 {
} return;
// Guards don't give us an easy mapping either }
if arms.iter().any(|arm| arm.guard.is_some()) { // Guards don't give us an easy mapping either
return; if arms.iter().any(|arm| arm.guard.is_some()) {
} return;
let check_types = self.matches_behaviour == MatchLintBehaviour::WellKnownTypes; }
let diverging_arm_opt = arms let check_types = self.matches_behaviour == MatchLintBehaviour::WellKnownTypes;
.iter() let diverging_arm_opt = arms
.enumerate() .iter()
.find(|(_, arm)| expr_diverges(cx, arm.body) && pat_allowed_for_else(cx, arm.pat, check_types)); .enumerate()
let Some((idx, diverging_arm)) = diverging_arm_opt else { return; }; .find(|(_, arm)| expr_diverges(cx, arm.body) && pat_allowed_for_else(cx, arm.pat, check_types));
// If the non-diverging arm is the first one, its pattern can be reused in a let/else statement. let Some((idx, diverging_arm)) = diverging_arm_opt else { return; };
// However, if it arrives in second position, its pattern may cover some cases already covered // If the non-diverging arm is the first one, its pattern can be reused in a let/else statement.
// by the diverging one. // However, if it arrives in second position, its pattern may cover some cases already covered
// TODO: accept the non-diverging arm as a second position if patterns are disjointed. // by the diverging one.
if idx == 0 { // TODO: accept the non-diverging arm as a second position if patterns are disjointed.
return; if idx == 0 {
} return;
let pat_arm = &arms[1 - idx]; }
if !expr_is_simple_identity(pat_arm.pat, pat_arm.body) { let pat_arm = &arms[1 - idx];
return; if !expr_is_simple_identity(pat_arm.pat, pat_arm.body) {
} return;
}
emit_manual_let_else(cx, stmt.span, match_expr, local.pat, pat_arm.pat, diverging_arm.body); emit_manual_let_else(cx, stmt.span, match_expr, local.pat, pat_arm.pat, diverging_arm.body);
}, },
} }
}; };
} }