Merge pull request #2864 from flip1995/issue-2862

Fix panic on map_clone lint
This commit is contained in:
Oliver Schneider 2018-06-21 16:14:40 +02:00 committed by GitHub
commit 5f5fa084ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions

View file

@ -36,7 +36,6 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
ExprClosure(_, ref decl, closure_eid, _, _) => {
let body = cx.tcx.hir.body(closure_eid);
let closure_expr = remove_blocks(&body.value);
let ty = cx.tables.pat_ty(&body.arguments[0].pat);
if_chain! {
// nothing special in the argument, besides reference bindings
// (e.g. .map(|&x| x) )
@ -45,6 +44,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
// the method is being called on a known type (option or iterator)
if let Some(type_name) = get_type_name(cx, expr, &args[0]);
then {
// We know that body.arguments is not empty at this point
let ty = cx.tables.pat_ty(&body.arguments[0].pat);
// look for derefs, for .map(|x| *x)
if only_derefs(cx, &*closure_expr, arg_ident) &&
// .cloned() only removes one level of indirection, don't lint on more

View file

@ -0,0 +1,14 @@
pub trait FooMap {
fn map<B, F: Fn() -> B>(&self, f: F) -> B;
}
impl FooMap for bool {
fn map<B, F: Fn() -> B>(&self, f: F) -> B {
f()
}
}
fn main() {
let a = true;
a.map(|| false);
}