Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-15 17:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework suggestion generation and use multipart_suggestion again

Browse source
This commit is contained in:
flip1995 2020-02-17 18:10:59 +01:00
parent a1a1a4b82a
commit 0f69cafc2d
No known key found for this signature in database
GPG key ID: 693086869D506637
1 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
clippy_lints/src/types.rs
View file

@ -794,32 +794,43 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnitArg {
if !args_to_recover.is_empty() {
let mut applicability = Applicability::MachineApplicable;
span_lint_and_then(cx, UNIT_ARG, expr.span, "passing a unit value to a function", |db| {
db.span_suggestion(
expr.span.with_hi(expr.span.lo()),
"move the expressions in front of the call...",
format!(
"{} ",
args_to_recover
let sugg = args_to_recover
.iter()
.map(|arg| {
.enumerate()
.map(|(i, arg)| {
let indent = if i == 0 {
0
} else {
indent_of(cx, expr.span).unwrap_or(0)
};
format!(
"{};",
snippet_with_applicability(cx, arg.span, "..", &mut applicability)
"{}{};",
" ".repeat(indent),
snippet_block_with_applicability(
cx,
arg.span,
"..",
Some(expr.span),
&mut applicability
)
)
})
.collect::<Vec<String>>()
.join(" ")
),
applicability,
);
for arg in args_to_recover {
.join("\n");
db.span_suggestion(
arg.span,
"...and use unit literals instead",
"()".to_string(),
expr.span.with_hi(expr.span.lo()),
&format!("{}move the expressions in front of the call...", or),
format!("{}\n", sugg),
applicability,
);
db.multipart_suggestion(
"...and use unit literals instead",
args_to_recover
.iter()
.map(|arg| (arg.span, "()".to_string()))
.collect::<Vec<_>>(),
applicability,
);
}
});
}
},