librustc: Don't emit unused mut lint twice.

1 files changed, 17 insertions, 24 deletions

diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs
index ccabfe28dd7..1ac14dfc4b1 100644
--- a/src/librustc/middle/lint.rs
+++ b/src/librustc/middle/lint.rs
@@ -813,32 +813,25 @@ fn check_unused_unsafe(cx: &Context, e: &ast::Expr) {
 }
 
 fn check_unused_mut_pat(cx: &Context, p: @ast::Pat) {
-    fn check_unused_mut_pat_inner(cx: &Context, p: @ast::Pat) {
-        let mut used = false;
-        let mut bindings = 0;
-        do pat_util::pat_bindings(cx.tcx.def_map, p) |_, id, _, _| {
-            used = used || cx.tcx.used_mut_nodes.contains(&id);
-            bindings += 1;
-        }
-        if !used {
-            let msg = if bindings == 1 {
-                "variable does not need to be mutable"
-            } else {
-                "variables do not need to be mutable"
-            };
-            cx.span_lint(unused_mut, p.span, msg);
-        }
-    }
-    do ast_util::walk_pat(p) |pat| {
-        match pat.node {
-            ast::PatIdent(ast::BindByValue(ast::MutMutable), _, _) => {
-                check_unused_mut_pat_inner(cx, pat);
+    match p.node {
+        ast::PatIdent(ast::BindByValue(ast::MutMutable), _, _) => {
+            let mut used = false;
+            let mut bindings = 0;
+            do pat_util::pat_bindings(cx.tcx.def_map, p) |_, id, _, _| {
+                used = used || cx.tcx.used_mut_nodes.contains(&id);
+                bindings += 1;
+            }
+            if !used {
+                let msg = if bindings == 1 {
+                    "variable does not need to be mutable"
+                } else {
+                    "variables do not need to be mutable"
+                };
+                cx.span_lint(unused_mut, p.span, msg);
             }
-            _ => {}
         }
-
-        true
-    };
+        _ => ()
+    }
 }
 
 fn check_unnecessary_allocation(cx: &Context, e: &ast::Expr) {