2018-11-27 21:14:15 +01:00
|
|
|
use if_chain::if_chain;
|
2020-03-01 12:23:33 +09:00
|
|
|
use rustc_ast::ast;
|
|
|
|
use rustc_ast::visit::FnKind;
|
2018-12-29 16:04:45 +01:00
|
|
|
use rustc_errors::Applicability;
|
2020-01-12 15:08:41 +09:00
|
|
|
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
|
2020-03-30 11:02:14 +02:00
|
|
|
use rustc_middle::lint::in_external_macro;
|
2020-01-11 20:37:08 +09:00
|
|
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
2020-01-04 11:00:00 +01:00
|
|
|
use rustc_span::source_map::Span;
|
2019-12-31 09:17:56 +09:00
|
|
|
use rustc_span::BytePos;
|
2015-08-11 21:47:34 +02:00
|
|
|
|
2020-06-03 01:13:57 +02:00
|
|
|
use crate::utils::{snippet_opt, span_lint_and_sugg, span_lint_and_then};
|
2019-01-31 01:15:29 +00:00
|
|
|
|
2018-03-28 15:24:26 +02:00
|
|
|
declare_clippy_lint! {
|
2019-03-05 11:50:33 -05:00
|
|
|
/// **What it does:** Checks for return statements at the end of a block.
|
|
|
|
///
|
|
|
|
/// **Why is this bad?** Removing the `return` and semicolon will make the code
|
|
|
|
/// more rusty.
|
|
|
|
///
|
|
|
|
/// **Known problems:** If the computation returning the value borrows a local
|
|
|
|
/// variable, removing the `return` may run afoul of the borrow checker.
|
|
|
|
///
|
|
|
|
/// **Example:**
|
|
|
|
/// ```rust
|
2019-03-05 17:23:50 -05:00
|
|
|
/// fn foo(x: usize) -> usize {
|
2019-03-05 11:50:33 -05:00
|
|
|
/// return x;
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
/// simplify to
|
|
|
|
/// ```rust
|
2019-03-05 17:23:50 -05:00
|
|
|
/// fn foo(x: usize) -> usize {
|
2019-03-05 11:50:33 -05:00
|
|
|
/// x
|
|
|
|
/// }
|
|
|
|
/// ```
|
2016-08-06 10:18:36 +02:00
|
|
|
pub NEEDLESS_RETURN,
|
2018-03-28 15:24:26 +02:00
|
|
|
style,
|
2016-02-06 00:13:29 +01:00
|
|
|
"using a return statement like `return expr;` where an expression would suffice"
|
|
|
|
}
|
|
|
|
|
2018-09-27 19:10:20 +02:00
|
|
|
declare_clippy_lint! {
|
2019-03-05 11:50:33 -05:00
|
|
|
/// **What it does:** Checks for unit (`()`) expressions that can be removed.
|
|
|
|
///
|
|
|
|
/// **Why is this bad?** Such expressions add no value, but can make the code
|
|
|
|
/// less readable. Depending on formatting they can make a `break` or `return`
|
|
|
|
/// statement look like a function call.
|
|
|
|
///
|
|
|
|
/// **Known problems:** The lint currently misses unit return types in types,
|
2019-01-31 01:15:29 +00:00
|
|
|
/// e.g., the `F` in `fn generic_unit<F: Fn() -> ()>(f: F) { .. }`.
|
2019-03-05 11:50:33 -05:00
|
|
|
///
|
|
|
|
/// **Example:**
|
|
|
|
/// ```rust
|
|
|
|
/// fn return_unit() -> () {
|
|
|
|
/// ()
|
|
|
|
/// }
|
|
|
|
/// ```
|
2018-09-27 19:10:20 +02:00
|
|
|
pub UNUSED_UNIT,
|
|
|
|
style,
|
|
|
|
"needless unit expression"
|
|
|
|
}
|
|
|
|
|
2019-06-19 14:56:02 +02:00
|
|
|
#[derive(PartialEq, Eq, Copy, Clone)]
|
|
|
|
enum RetReplacement {
|
|
|
|
Empty,
|
2019-07-08 20:45:51 +02:00
|
|
|
Block,
|
2019-06-19 14:56:02 +02:00
|
|
|
}
|
|
|
|
|
2020-06-03 01:13:57 +02:00
|
|
|
declare_lint_pass!(Return => [NEEDLESS_RETURN, UNUSED_UNIT]);
|
2015-08-11 21:47:34 +02:00
|
|
|
|
2019-04-08 13:43:55 -07:00
|
|
|
impl Return {
|
2015-08-11 21:47:34 +02:00
|
|
|
// Check the final stmt or expr in a block for unnecessary return.
|
2018-07-23 13:01:12 +02:00
|
|
|
fn check_block_return(&mut self, cx: &EarlyContext<'_>, block: &ast::Block) {
|
2016-06-28 15:54:23 +02:00
|
|
|
if let Some(stmt) = block.stmts.last() {
|
2019-09-27 17:16:06 +02:00
|
|
|
match stmt.kind {
|
2017-09-05 11:33:04 +02:00
|
|
|
ast::StmtKind::Expr(ref expr) | ast::StmtKind::Semi(ref expr) => {
|
2019-06-19 14:56:02 +02:00
|
|
|
self.check_final_expr(cx, expr, Some(stmt.span), RetReplacement::Empty);
|
2016-12-20 18:21:30 +01:00
|
|
|
},
|
2016-06-28 15:54:23 +02:00
|
|
|
_ => (),
|
2015-08-11 21:47:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-03 01:13:57 +02:00
|
|
|
// Check the final expression in a block if it's a return.
|
2019-06-21 14:46:34 +02:00
|
|
|
fn check_final_expr(
|
|
|
|
&mut self,
|
|
|
|
cx: &EarlyContext<'_>,
|
|
|
|
expr: &ast::Expr,
|
|
|
|
span: Option<Span>,
|
|
|
|
replacement: RetReplacement,
|
|
|
|
) {
|
2019-09-27 17:16:06 +02:00
|
|
|
match expr.kind {
|
2015-08-11 21:47:34 +02:00
|
|
|
// simple return is always "bad"
|
2019-06-19 14:56:02 +02:00
|
|
|
ast::ExprKind::Ret(ref inner) => {
|
2016-11-19 20:10:04 +09:00
|
|
|
// allow `#[cfg(a)] return a; #[cfg(b)] return b;`
|
|
|
|
if !expr.attrs.iter().any(attr_is_cfg) {
|
2019-10-03 14:09:32 -05:00
|
|
|
Self::emit_return_lint(
|
2019-06-21 14:46:34 +02:00
|
|
|
cx,
|
|
|
|
span.expect("`else return` is not possible"),
|
|
|
|
inner.as_ref().map(|i| i.span),
|
|
|
|
replacement,
|
|
|
|
);
|
2016-11-19 20:10:04 +09:00
|
|
|
}
|
2016-12-20 18:21:30 +01:00
|
|
|
},
|
2015-08-11 21:47:34 +02:00
|
|
|
// a whole block? check it!
|
2018-05-17 11:21:15 +02:00
|
|
|
ast::ExprKind::Block(ref block, _) => {
|
2015-08-11 21:47:34 +02:00
|
|
|
self.check_block_return(cx, block);
|
2016-12-20 18:21:30 +01:00
|
|
|
},
|
2015-08-11 21:47:34 +02:00
|
|
|
// an if/if let expr, check both exprs
|
|
|
|
// note, if without else is going to be a type checking error anyways
|
|
|
|
// (except for unit type functions) so we don't match it
|
2016-11-16 21:57:56 +01:00
|
|
|
ast::ExprKind::If(_, ref ifblock, Some(ref elsexpr)) => {
|
2015-08-11 21:47:34 +02:00
|
|
|
self.check_block_return(cx, ifblock);
|
2019-06-19 14:56:02 +02:00
|
|
|
self.check_final_expr(cx, elsexpr, None, RetReplacement::Empty);
|
2016-12-20 18:21:30 +01:00
|
|
|
},
|
2015-08-11 21:47:34 +02:00
|
|
|
// a match expr, check all arms
|
2018-11-27 21:14:15 +01:00
|
|
|
ast::ExprKind::Match(_, ref arms) => {
|
|
|
|
for arm in arms {
|
2019-07-08 20:45:51 +02:00
|
|
|
self.check_final_expr(cx, &arm.body, Some(arm.body.span), RetReplacement::Block);
|
2018-11-27 21:14:15 +01:00
|
|
|
}
|
2016-12-20 18:21:30 +01:00
|
|
|
},
|
2016-04-14 20:14:03 +02:00
|
|
|
_ => (),
|
2015-08-11 21:47:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-03 14:09:32 -05:00
|
|
|
fn emit_return_lint(cx: &EarlyContext<'_>, ret_span: Span, inner_span: Option<Span>, replacement: RetReplacement) {
|
2019-06-19 14:56:02 +02:00
|
|
|
match inner_span {
|
|
|
|
Some(inner_span) => {
|
2019-08-19 09:30:32 -07:00
|
|
|
if in_external_macro(cx.sess(), inner_span) || inner_span.from_expansion() {
|
2019-06-19 14:56:02 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-04-17 08:08:00 +02:00
|
|
|
span_lint_and_then(cx, NEEDLESS_RETURN, ret_span, "unneeded `return` statement", |diag| {
|
2019-06-19 14:56:02 +02:00
|
|
|
if let Some(snippet) = snippet_opt(cx, inner_span) {
|
2020-04-17 08:08:00 +02:00
|
|
|
diag.span_suggestion(ret_span, "remove `return`", snippet, Applicability::MachineApplicable);
|
2019-06-21 14:46:34 +02:00
|
|
|
}
|
|
|
|
})
|
|
|
|
},
|
|
|
|
None => match replacement {
|
|
|
|
RetReplacement::Empty => {
|
2020-04-17 22:01:25 +08:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_RETURN,
|
|
|
|
ret_span,
|
|
|
|
"unneeded `return` statement",
|
|
|
|
"remove `return`",
|
|
|
|
String::new(),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
);
|
2019-06-21 14:46:34 +02:00
|
|
|
},
|
2019-07-08 20:45:51 +02:00
|
|
|
RetReplacement::Block => {
|
2020-04-17 22:01:25 +08:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
NEEDLESS_RETURN,
|
|
|
|
ret_span,
|
|
|
|
"unneeded `return` statement",
|
|
|
|
"replace `return` with an empty block",
|
|
|
|
"{}".to_string(),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
);
|
2019-06-21 14:46:34 +02:00
|
|
|
},
|
2019-06-19 14:56:02 +02:00
|
|
|
},
|
|
|
|
}
|
2015-08-11 21:47:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-08 13:43:55 -07:00
|
|
|
impl EarlyLintPass for Return {
|
2020-02-06 20:29:58 +01:00
|
|
|
fn check_fn(&mut self, cx: &EarlyContext<'_>, kind: FnKind<'_>, span: Span, _: ast::NodeId) {
|
2016-11-16 21:57:56 +01:00
|
|
|
match kind {
|
2020-02-06 20:29:58 +01:00
|
|
|
FnKind::Fn(.., Some(block)) => self.check_block_return(cx, block),
|
|
|
|
FnKind::Closure(_, body) => self.check_final_expr(cx, body, Some(body.span), RetReplacement::Empty),
|
|
|
|
FnKind::Fn(.., None) => {},
|
2016-11-16 21:57:56 +01:00
|
|
|
}
|
2018-09-27 19:10:20 +02:00
|
|
|
if_chain! {
|
2020-02-17 18:36:17 +09:00
|
|
|
if let ast::FnRetTy::Ty(ref ty) = kind.decl().output;
|
2019-09-27 17:16:06 +02:00
|
|
|
if let ast::TyKind::Tup(ref vals) = ty.kind;
|
2019-08-19 09:30:32 -07:00
|
|
|
if vals.is_empty() && !ty.span.from_expansion() && get_def(span) == get_def(ty.span);
|
2018-09-27 19:10:20 +02:00
|
|
|
then {
|
2020-05-13 01:04:16 +02:00
|
|
|
lint_unneeded_unit_return(cx, ty, span);
|
2018-09-27 19:10:20 +02:00
|
|
|
}
|
|
|
|
}
|
2015-09-20 13:57:27 +02:00
|
|
|
}
|
|
|
|
|
2018-07-23 13:01:12 +02:00
|
|
|
fn check_block(&mut self, cx: &EarlyContext<'_>, block: &ast::Block) {
|
2018-09-27 19:10:20 +02:00
|
|
|
if_chain! {
|
|
|
|
if let Some(ref stmt) = block.stmts.last();
|
2019-09-27 17:16:06 +02:00
|
|
|
if let ast::StmtKind::Expr(ref expr) = stmt.kind;
|
2019-08-24 21:42:39 +02:00
|
|
|
if is_unit_expr(expr) && !stmt.span.from_expansion();
|
2018-09-27 19:10:20 +02:00
|
|
|
then {
|
|
|
|
let sp = expr.span;
|
2020-04-17 22:01:25 +08:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
UNUSED_UNIT,
|
|
|
|
sp,
|
|
|
|
"unneeded unit expression",
|
|
|
|
"remove the final `()`",
|
|
|
|
String::new(),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
);
|
2018-09-27 19:10:20 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn check_expr(&mut self, cx: &EarlyContext<'_>, e: &ast::Expr) {
|
2019-09-27 17:16:06 +02:00
|
|
|
match e.kind {
|
2018-09-27 19:10:20 +02:00
|
|
|
ast::ExprKind::Ret(Some(ref expr)) | ast::ExprKind::Break(_, Some(ref expr)) => {
|
2019-08-19 09:30:32 -07:00
|
|
|
if is_unit_expr(expr) && !expr.span.from_expansion() {
|
2020-04-17 22:01:25 +08:00
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
UNUSED_UNIT,
|
|
|
|
expr.span,
|
|
|
|
"unneeded `()`",
|
|
|
|
"remove the `()`",
|
|
|
|
String::new(),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
);
|
2018-09-27 19:10:20 +02:00
|
|
|
}
|
2018-11-27 21:14:15 +01:00
|
|
|
},
|
|
|
|
_ => (),
|
2018-09-27 19:10:20 +02:00
|
|
|
}
|
2015-08-11 21:47:34 +02:00
|
|
|
}
|
2020-05-13 01:04:16 +02:00
|
|
|
|
|
|
|
fn check_poly_trait_ref(&mut self, cx: &EarlyContext<'_>, poly: &ast::PolyTraitRef, _: &ast::TraitBoundModifier) {
|
|
|
|
let segments = &poly.trait_ref.path.segments;
|
|
|
|
|
|
|
|
if_chain! {
|
|
|
|
if segments.len() == 1;
|
|
|
|
if ["Fn", "FnMut", "FnOnce"].contains(&&*segments[0].ident.name.as_str());
|
|
|
|
if let Some(args) = &segments[0].args;
|
|
|
|
if let ast::GenericArgs::Parenthesized(generic_args) = &**args;
|
|
|
|
if let ast::FnRetTy::Ty(ty) = &generic_args.output;
|
|
|
|
if ty.kind.is_unit();
|
|
|
|
then {
|
|
|
|
lint_unneeded_unit_return(cx, ty, generic_args.span);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-08-11 21:47:34 +02:00
|
|
|
}
|
2016-11-20 10:15:40 +09:00
|
|
|
|
|
|
|
fn attr_is_cfg(attr: &ast::Attribute) -> bool {
|
2019-05-17 23:53:54 +02:00
|
|
|
attr.meta_item_list().is_some() && attr.check_name(sym!(cfg))
|
2016-11-20 10:15:40 +09:00
|
|
|
}
|
2018-09-27 19:10:20 +02:00
|
|
|
|
|
|
|
// get the def site
|
2019-09-18 08:37:41 +02:00
|
|
|
#[must_use]
|
2018-09-27 19:10:20 +02:00
|
|
|
fn get_def(span: Span) -> Option<Span> {
|
2019-08-16 09:29:30 -07:00
|
|
|
if span.from_expansion() {
|
|
|
|
Some(span.ctxt().outer_expn_data().def_site)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
2018-09-27 19:10:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// is this expr a `()` unit?
|
|
|
|
fn is_unit_expr(expr: &ast::Expr) -> bool {
|
2019-09-27 17:16:06 +02:00
|
|
|
if let ast::ExprKind::Tup(ref vals) = expr.kind {
|
2018-09-27 19:10:20 +02:00
|
|
|
vals.is_empty()
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
2020-05-13 01:04:16 +02:00
|
|
|
|
|
|
|
fn lint_unneeded_unit_return(cx: &EarlyContext<'_>, ty: &ast::Ty, span: Span) {
|
|
|
|
let (ret_span, appl) = if let Ok(fn_source) = cx.sess().source_map().span_to_snippet(span.with_hi(ty.span.hi())) {
|
2020-06-25 11:58:47 -07:00
|
|
|
fn_source
|
|
|
|
.rfind("->")
|
|
|
|
.map_or((ty.span, Applicability::MaybeIncorrect), |rpos| {
|
|
|
|
(
|
|
|
|
#[allow(clippy::cast_possible_truncation)]
|
|
|
|
ty.span.with_lo(BytePos(span.lo().0 + rpos as u32)),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
)
|
|
|
|
})
|
2020-05-13 01:04:16 +02:00
|
|
|
} else {
|
|
|
|
(ty.span, Applicability::MaybeIncorrect)
|
|
|
|
};
|
|
|
|
span_lint_and_sugg(
|
|
|
|
cx,
|
|
|
|
UNUSED_UNIT,
|
|
|
|
ret_span,
|
|
|
|
"unneeded unit return type",
|
|
|
|
"remove the `-> ()`",
|
|
|
|
String::new(),
|
|
|
|
appl,
|
|
|
|
);
|
|
|
|
}
|