Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2025-02-25 20:07:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework suggestion generation of unit_arg lint

Browse source
This commit is contained in:
flip1995 2019-08-26 18:34:30 +02:00
parent 8aa8f42556
commit 0ab823c509
No known key found for this signature in database
GPG key ID: 693086869D506637
1 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
clippy_lints/src/types.rs
View file

@ -779,6 +779,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnitArg {
match expr.kind {
ExprKind::Call(_, args) | ExprKind::MethodCall(_, _, args) => {
let mut args_to_recover = vec![];
for arg in args {
if is_unit(cx.tables.expr_ty(arg)) && !is_unit_literal(arg) {
if let ExprKind::Match(.., match_source) = &arg.kind {
@ -787,17 +788,40 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnitArg {
}
}
span_lint_and_sugg(
cx,
UNIT_ARG,
arg.span,
"passing a unit value to a function",
"if you intended to pass a unit value, use a unit literal instead",
"()".to_string(),
Applicability::MaybeIncorrect,
);
args_to_recover.push(arg);
}
}
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
.iter()
.map(|arg| {
format!(
"{};",
snippet_with_applicability(cx, arg.span, "..", &mut applicability)
)
})
.collect::<Vec<String>>()
.join(" ")
),
applicability,
);
db.multipart_suggestion(
"...and use unit literals instead",
args_to_recover
.iter()
.map(|arg| (arg.span, "()".to_string()))
.collect::<Vec<_>>(),
applicability,
);
});
}
},
_ => (),
}