Add eta reduction (fixes #29)
This commit is contained in:
parent
709dfe1cea
commit
2447e1d5be
6 changed files with 88 additions and 1 deletions
59
src/eta_reduction.rs
Normal file
59
src/eta_reduction.rs
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
use syntax::ast::*;
|
||||
use rustc::lint::{Context, LintPass, LintArray, Lint, Level};
|
||||
use syntax::codemap::{Span, Spanned};
|
||||
use syntax::print::pprust::expr_to_string;
|
||||
|
||||
|
||||
#[allow(missing_copy_implementations)]
|
||||
pub struct EtaPass;
|
||||
|
||||
|
||||
declare_lint!(pub REDUNDANT_CLOSURE, Warn,
|
||||
"Warn on usage of redundant closures, i.e. `|a| foo(a)`");
|
||||
|
||||
impl LintPass for EtaPass {
|
||||
fn get_lints(&self) -> LintArray {
|
||||
lint_array!(REDUNDANT_CLOSURE)
|
||||
}
|
||||
|
||||
fn check_expr(&mut self, cx: &Context, expr: &Expr) {
|
||||
if let ExprClosure(_, ref decl, ref blk) = expr.node {
|
||||
if blk.stmts.len() != 0 {
|
||||
// || {foo(); bar()}; can't be reduced here
|
||||
return;
|
||||
}
|
||||
if let Some(ref ex) = blk.expr {
|
||||
if let ExprCall(ref caller, ref args) = ex.node {
|
||||
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;
|
||||
}
|
||||
for (ref a1, ref a2) in decl.inputs.iter().zip(args) {
|
||||
if let PatIdent(_, ident, _) = a1.pat.node {
|
||||
// XXXManishearth Should I be checking the binding mode here?
|
||||
if let ExprPath(None, ref p) = a2.node {
|
||||
if p.segments.len() != 1 {
|
||||
// If it's a proper path, it can't be a local variable
|
||||
return;
|
||||
}
|
||||
if p.segments[0].identifier != ident.node {
|
||||
// The two idents should be the same
|
||||
return
|
||||
}
|
||||
} else {
|
||||
return
|
||||
}
|
||||
} else {
|
||||
return
|
||||
}
|
||||
}
|
||||
cx.span_lint(REDUNDANT_CLOSURE, expr.span,
|
||||
&format!("Redundant closure found, consider using `{}` in its place",
|
||||
expr_to_string(caller))[..])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -21,6 +21,7 @@ pub mod bit_mask;
|
|||
pub mod ptr_arg;
|
||||
pub mod needless_bool;
|
||||
pub mod approx_const;
|
||||
pub mod eta_reduction;
|
||||
|
||||
#[plugin_registrar]
|
||||
pub fn plugin_registrar(reg: &mut Registry) {
|
||||
|
|
@ -36,6 +37,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
|
|||
reg.register_lint_pass(box approx_const::ApproxConstant as LintPassObject);
|
||||
reg.register_lint_pass(box misc::FloatCmp as LintPassObject);
|
||||
reg.register_lint_pass(box misc::Precedence as LintPassObject);
|
||||
reg.register_lint_pass(box eta_reduction::EtaPass as LintPassObject);
|
||||
|
||||
reg.register_lint_group("clippy", vec![types::BOX_VEC, types::LINKEDLIST,
|
||||
misc::SINGLE_MATCH, misc::STR_TO_STRING,
|
||||
|
|
@ -45,5 +47,6 @@ pub fn plugin_registrar(reg: &mut Registry) {
|
|||
approx_const::APPROX_CONSTANT,
|
||||
misc::CMP_NAN, misc::FLOAT_CMP,
|
||||
misc::PRECEDENCE,
|
||||
eta_reduction::REDUNDANT_CLOSURE,
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue