Rustup to *rustc 1.20.0-nightly (d84693b93 2017-07-09)*

[rust.git] / clippy_lints / src / map_clone.rs

diff --git a/clippy_lints/src/map_clone.rs b/clippy_lints/src/map_clone.rs
index 6b721a970a6091ba2c59ca7020aaf4dd9a3bd7d9..1661c71167eccdea320db5087231e66623c05e69 100644 (file)
--- a/clippy_lints/src/map_clone.rs
+++ b/clippy_lints/src/map_clone.rs
@@ -28,8 +28,8 @@
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
     fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
         // call to .map()
-        if let ExprMethodCall(name, _, ref args) = expr.node {
-            if name.node == "map" && args.len() == 2 {
+        if let ExprMethodCall(ref method, _, ref args) = expr.node {
+            if method.name == "map" && args.len() == 2 {
                 match args[1].node {
                     ExprClosure(_, ref decl, closure_eid, _) => {
                         let body = cx.tcx.hir.body(closure_eid);
@@ -59,8 +59,8 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
                                 }
                             }
                             // explicit clone() calls ( .map(|x| x.clone()) )
-                            else if let ExprMethodCall(clone_call, _, ref clone_args) = closure_expr.node {
-                                if clone_call.node == "clone" &&
+                            else if let ExprMethodCall(ref clone_call, _, ref clone_args) = closure_expr.node {
+                                if clone_call.name == "clone" &&
                                     clone_args.len() == 1 &&
                                     match_trait_method(cx, closure_expr, &paths::CLONE_TRAIT) &&
                                     expr_eq_name(&clone_args[0], arg_ident)