2018-11-27 14:14:15 -06:00
|
|
|
use crate::utils::{is_adjusted, iter_input_pats, snippet_opt, span_lint_and_then};
|
2018-12-29 09:04:45 -06:00
|
|
|
use rustc::hir::*;
|
|
|
|
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
|
|
|
|
use rustc::ty;
|
|
|
|
use rustc::{declare_tool_lint, lint_array};
|
|
|
|
use rustc_errors::Applicability;
|
2015-07-26 09:53:11 -05:00
|
|
|
|
2015-05-10 00:09:04 -05:00
|
|
|
pub struct EtaPass;
|
|
|
|
|
2016-08-06 02:55:04 -05:00
|
|
|
/// **What it does:** Checks for closures which just call another function where
|
|
|
|
/// the function can be called directly. `unsafe` functions or calls where types
|
|
|
|
/// get adjusted are ignored.
|
2015-12-10 18:22:27 -06:00
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
/// **Why is this bad?** Needlessly creating a closure adds code for no benefit
|
|
|
|
/// and gives the optimizer more work.
|
2015-12-10 18:22:27 -06:00
|
|
|
///
|
2018-07-21 11:05:02 -05:00
|
|
|
/// **Known problems:** If creating the closure inside the closure has a side-
|
|
|
|
/// effect then moving the closure creation out will change when that side-
|
|
|
|
/// effect runs.
|
2018-11-21 21:40:09 -06:00
|
|
|
/// See https://github.com/rust-lang/rust-clippy/issues/1439 for more
|
2018-07-21 11:05:02 -05:00
|
|
|
/// details.
|
2015-12-10 18:22:27 -06:00
|
|
|
///
|
2016-08-06 02:55:04 -05:00
|
|
|
/// **Example:**
|
|
|
|
/// ```rust
|
|
|
|
/// xs.map(|x| foo(x))
|
|
|
|
/// ```
|
2017-08-09 02:30:56 -05:00
|
|
|
/// where `foo(_)` is a plain function that takes the exact argument type of
|
|
|
|
/// `x`.
|
2018-03-28 08:24:26 -05:00
|
|
|
declare_clippy_lint! {
|
2016-08-06 03:18:36 -05:00
|
|
|
pub REDUNDANT_CLOSURE,
|
2018-03-28 08:24:26 -05:00
|
|
|
style,
|
2016-08-06 03:18:36 -05:00
|
|
|
"redundant closures, i.e. `|a| foo(a)` (which can be written as just `foo`)"
|
2016-02-05 17:13:29 -06:00
|
|
|
}
|
2015-05-10 00:09:04 -05:00
|
|
|
|
|
|
|
impl LintPass for EtaPass {
|
|
|
|
fn get_lints(&self) -> LintArray {
|
|
|
|
lint_array!(REDUNDANT_CLOSURE)
|
|
|
|
}
|
2015-09-18 21:53:04 -05:00
|
|
|
}
|
2015-05-10 00:09:04 -05:00
|
|
|
|
2016-12-07 06:13:40 -06:00
|
|
|
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EtaPass {
|
|
|
|
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
|
2015-08-21 13:44:48 -05:00
|
|
|
match expr.node {
|
2018-11-27 14:14:15 -06:00
|
|
|
ExprKind::Call(_, ref args) | ExprKind::MethodCall(_, _, ref args) => {
|
|
|
|
for arg in args {
|
|
|
|
check_closure(cx, arg)
|
|
|
|
}
|
2016-12-20 11:21:30 -06:00
|
|
|
},
|
2015-08-14 07:21:05 -05:00
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-23 06:01:12 -05:00
|
|
|
fn check_closure(cx: &LateContext<'_, '_>, expr: &Expr) {
|
2018-07-12 02:30:57 -05:00
|
|
|
if let ExprKind::Closure(_, ref decl, eid, _, _) = expr.node {
|
2018-12-07 18:56:03 -06:00
|
|
|
let body = cx.tcx.hir().body(eid);
|
2017-01-04 17:48:34 -06:00
|
|
|
let ex = &body.value;
|
2018-07-12 02:30:57 -05:00
|
|
|
if let ExprKind::Call(ref caller, ref args) = ex.node {
|
2016-11-16 14:57:56 -06:00
|
|
|
if args.len() != decl.inputs.len() {
|
|
|
|
// Not the same number of arguments, there
|
|
|
|
// is no way the closure is the same as the function
|
|
|
|
return;
|
|
|
|
}
|
2017-01-04 17:48:34 -06:00
|
|
|
if is_adjusted(cx, ex) || args.iter().any(|arg| is_adjusted(cx, arg)) {
|
2016-11-16 14:57:56 -06:00
|
|
|
// Are the expression or the arguments type-adjusted? Then we need the closure
|
|
|
|
return;
|
|
|
|
}
|
2017-01-13 10:04:56 -06:00
|
|
|
let fn_ty = cx.tables.expr_ty(caller);
|
2016-11-16 14:57:56 -06:00
|
|
|
match fn_ty.sty {
|
|
|
|
// Is it an unsafe function? They don't implement the closure traits
|
2018-08-22 16:34:52 -05:00
|
|
|
ty::FnDef(..) | ty::FnPtr(_) => {
|
2017-06-29 08:38:25 -05:00
|
|
|
let sig = fn_ty.fn_sig(cx.tcx);
|
2018-08-22 16:34:52 -05:00
|
|
|
if sig.skip_binder().unsafety == Unsafety::Unsafe || sig.skip_binder().output().sty == ty::Never {
|
2016-11-16 14:57:56 -06:00
|
|
|
return;
|
|
|
|
}
|
2016-12-20 11:21:30 -06:00
|
|
|
},
|
2016-11-16 14:57:56 -06:00
|
|
|
_ => (),
|
|
|
|
}
|
2017-01-04 15:46:41 -06:00
|
|
|
for (a1, a2) in iter_input_pats(decl, body).zip(args) {
|
|
|
|
if let PatKind::Binding(_, _, ident, _) = a1.pat.node {
|
2016-11-16 14:57:56 -06:00
|
|
|
// XXXManishearth Should I be checking the binding mode here?
|
2018-07-12 02:30:57 -05:00
|
|
|
if let ExprKind::Path(QPath::Resolved(None, ref p)) = a2.node {
|
2016-11-16 14:57:56 -06:00
|
|
|
if p.segments.len() != 1 {
|
|
|
|
// If it's a proper path, it can't be a local variable
|
2016-03-10 11:13:49 -06:00
|
|
|
return;
|
|
|
|
}
|
2018-06-28 08:46:58 -05:00
|
|
|
if p.segments[0].ident.name != ident.name {
|
2016-11-16 14:57:56 -06:00
|
|
|
// The two idents should be the same
|
2016-01-03 22:26:12 -06:00
|
|
|
return;
|
2015-05-10 00:09:04 -05:00
|
|
|
}
|
2015-08-14 07:21:05 -05:00
|
|
|
} else {
|
2016-01-03 22:26:12 -06:00
|
|
|
return;
|
2015-05-10 00:09:04 -05:00
|
|
|
}
|
2016-11-16 14:57:56 -06:00
|
|
|
} else {
|
|
|
|
return;
|
2015-05-10 00:09:04 -05:00
|
|
|
}
|
|
|
|
}
|
2017-08-09 02:30:56 -05:00
|
|
|
span_lint_and_then(cx, REDUNDANT_CLOSURE, expr.span, "redundant closure found", |db| {
|
|
|
|
if let Some(snippet) = snippet_opt(cx, caller.span) {
|
2018-09-15 11:14:08 -05:00
|
|
|
db.span_suggestion_with_applicability(
|
2018-09-18 10:07:54 -05:00
|
|
|
expr.span,
|
|
|
|
"remove closure as shown",
|
|
|
|
snippet,
|
2018-09-18 12:01:17 -05:00
|
|
|
Applicability::MachineApplicable,
|
2018-09-18 10:07:54 -05:00
|
|
|
);
|
2017-08-09 02:30:56 -05:00
|
|
|
}
|
|
|
|
});
|
2015-05-10 00:09:04 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|