user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

manual_let_else: only add () around PatKind::Or at the top level

Browse source 
At the top level, () are required, but on the levels below they are not.
This commit is contained in:
est31 2023-06-01 18:55:24 +02:00
parent 652b4c720d
commit 0a7366897d
3 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
clippy_lints/src/manual_let_else.rs
View file

@ -159,7 +159,7 @@ fn emit_manual_let_else(
} else {
format!("{{ {sn_else} }}")
};
let sn_bl = replace_in_pattern(cx, span, local, pat, &mut app);
let sn_bl = replace_in_pattern(cx, span, local, pat, &mut app, true);
let sugg = format!("let {sn_bl} = {sn_expr} else {else_bl};");
diag.span_suggestion(span, "consider writing", sugg, app);
},
@ -173,6 +173,7 @@ fn replace_in_pattern(
local: &Pat<'_>,
pat: &Pat<'_>,
app: &mut Applicability,
top_level: bool,
) -> String {
let mut bindings_count = 0;
pat.each_binding_or_first(&mut |_, _, _, _| bindings_count += 1);
@ -191,16 +192,20 @@ fn replace_in_pattern(
PatKind::Or(pats) => {
let patterns = pats
.iter()
.map(|pat| replace_in_pattern(cx, span, local, pat, app))
.map(|pat| replace_in_pattern(cx, span, local, pat, app, false))
.collect::<Vec<_>>();
let or_pat = patterns.join(" | ");
return format!("({or_pat})");
if top_level {
return format!("({or_pat})");
} else {
return or_pat;
}
},
// Replace the variable name iff `TupleStruct` has one argument like `Variant(v)`.
PatKind::TupleStruct(ref w, args, dot_dot_pos) => {
let mut args = args
.iter()
.map(|pat| replace_in_pattern(cx, span, local, pat, app))
.map(|pat| replace_in_pattern(cx, span, local, pat, app, false))
.collect::<Vec<_>>();
if let Some(pos) = dot_dot_pos.as_opt_usize() {
args.insert(pos, "..".to_owned());