OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix redundant_closure false positive

Browse Source
This commit is contained in:
mcarton 2016-01-18 19:28:06 +01:00
parent 28b0437354
commit 9d5e9cfd97
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eta_reduction.rs
View File

@ -45,6 +45,7 @@ fn check_closure(cx: &LateContext, expr: &Expr) {
// || {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() {
@ -52,8 +53,8 @@ fn check_closure(cx: &LateContext, expr: &Expr) {
// is no way the closure is the same as the function
return;
}
if args.iter().any(|arg| is_adjusted(cx, arg)) {
// Are the arguments type-adjusted? Then we need the closure
if is_adjusted(cx, ex) || args.iter().any(|arg| is_adjusted(cx, arg)) {
// Are the expression or the arguments type-adjusted? Then we need the closure
return;
}
let fn_ty = cx.tcx.expr_ty(caller);

4
tests/compile-fail/eta.rs
View File

@ -21,6 +21,10 @@ fn main() {
unsafe {
Some(1u8).map(|a| unsafe_fn(a)); // unsafe fn
}
// See #515
let a: Option<Box<::std::ops::Deref<Target = [i32]>>> =
Some(vec![1i32, 2]).map(|v| -> Box<::std::ops::Deref<Target = [i32]>> { Box::new(v) });
}
fn meta<F>(f: F) where F: Fn(u8) {