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

tweak let_and_return diagnostic

Browse source 
Label the unnecessary let binding and convert the note to structured
suggestion.
This commit is contained in:
Andy Russell 2019-05-24 14:09:43 -04:00
parent d519ed433e
commit effea41fe4
No known key found for this signature in database
GPG key ID: BE2221033EDBC374
3 changed files with 43 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
clippy_lints/src/returns.rs
View file

@ -7,7 +7,7 @@ use syntax::source_map::Span;
use syntax::visit::FnKind;
use syntax_pos::BytePos;
use crate::utils::{in_macro_or_desugar, match_path_ast, snippet_opt, span_lint_and_then, span_note_and_lint};
use crate::utils::{in_macro_or_desugar, match_path_ast, snippet_opt, span_lint_and_then};
declare_clippy_lint! {
/// **What it does:** Checks for return statements at the end of a block.
@ -164,13 +164,28 @@ impl Return {
if match_path_ast(path, &[&*ident.name.as_str()]);
if !in_external_macro(cx.sess(), initexpr.span);
then {
span_note_and_lint(cx,
LET_AND_RETURN,
retexpr.span,
"returning the result of a let binding from a block. \
Consider returning the expression directly.",
initexpr.span,
"this expression can be directly returned");
span_lint_and_then(
cx,
LET_AND_RETURN,
retexpr.span,
"returning the result of a let binding from a block",
|err| {
err.span_label(local.span, "unnecessary let binding");
if let Some(snippet) = snippet_opt(cx, initexpr.span) {
err.multipart_suggestion(
"return the expression directly",
vec![
(local.span, String::new()),
(retexpr.span, snippet),
],
Applicability::MachineApplicable,
);
} else {
err.span_help(initexpr.span, "this expression can be directly returned");
}
},
);
}
}
}