squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Minor simplification to manual_map

Browse source
This commit is contained in:
Jason Newcomb 2021-11-17 10:36:13 -05:00
parent 80a263d469
commit 8506f66294
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
clippy_lints/src/manual_map.rs
View file

@ -179,37 +179,22 @@ impl LateLintPass<'_> for ManualMap {
} else {
""
};
let expr_snip = snippet_with_context(cx, some_expr.expr.span, expr_ctxt, "..", &mut app).0;
if some_expr.needs_unsafe_block {
format!(
"|{}{}| unsafe {{ {} }}",
annotation,
some_binding,
snippet_with_context(cx, some_expr.expr.span, expr_ctxt, "..", &mut app).0
)
format!("|{}{}| unsafe {{ {} }}", annotation, some_binding, expr_snip)
} else {
format!(
"|{}{}| {}",
annotation,
some_binding,
snippet_with_context(cx, some_expr.expr.span, expr_ctxt, "..", &mut app).0
)
format!("|{}{}| {}", annotation, some_binding, expr_snip)
}
}
}
} else if !is_wild_none && explicit_ref.is_none() {
// TODO: handle explicit reference annotations.
let pat_snip = snippet_with_context(cx, some_pat.span, expr_ctxt, "..", &mut app).0;
let expr_snip = snippet_with_context(cx, some_expr.expr.span, expr_ctxt, "..", &mut app).0;
if some_expr.needs_unsafe_block {
format!(
"|{}| unsafe {{ {} }}",
snippet_with_context(cx, some_pat.span, expr_ctxt, "..", &mut app).0,
snippet_with_context(cx, some_expr.expr.span, expr_ctxt, "..", &mut app).0
)
format!("|{}| unsafe {{ {} }}", pat_snip, expr_snip)
} else {
format!(
"|{}| {}",
snippet_with_context(cx, some_pat.span, expr_ctxt, "..", &mut app).0,
snippet_with_context(cx, some_expr.expr.span, expr_ctxt, "..", &mut app).0
)
format!("|{}| {}", pat_snip, expr_snip)
}
} else {
// Refutable bindings and mixed reference annotations can't be handled by `map`.