update to the rust-PR that unblocks clippy

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

diff --git a/clippy_lints/src/mut_mut.rs b/clippy_lints/src/mut_mut.rs
index 8a5439fb11e316d05101dec89bc21c9e2857800f..40bb77871dbc641caaa23351c44474c078261507 100644 (file)
--- a/clippy_lints/src/mut_mut.rs
+++ b/clippy_lints/src/mut_mut.rs
@@ -2,20 +2,24 @@
 use rustc::hir::intravisit;
 use rustc::lint::*;
 use rustc::ty::{TypeAndMut, TyRef};
-use utils::{in_external_macro, recover_for_loop, span_lint};
+use utils::{higher, in_external_macro, span_lint};
 
-/// **What it does:** This lint checks for instances of `mut mut` references.
+/// **What it does:** Checks for instances of `mut mut` references.
 ///
-/// **Why is this bad?** Multiple `mut`s don't add anything meaningful to the source.
+/// **Why is this bad?** Multiple `mut`s don't add anything meaningful to the
+/// source. This is either a copy'n'paste error, or it shows a fundamental
+/// misunderstanding of references.
 ///
-/// **Known problems:** None
+/// **Known problems:** None.
 ///
-/// **Example:** `let x = &mut &mut y;`
+/// **Example:**
+/// ```rust
+/// let x = &mut &mut y;
+/// ```
 declare_lint! {
     pub MUT_MUT,
     Allow,
-    "usage of double-mut refs, e.g. `&mut &mut ...` (either copy'n'paste error, \
-     or shows a fundamental misunderstanding of references)"
+    "usage of double-mut refs, e.g. `&mut &mut ...`"
 }
 
 #[derive(Copy,Clone)]
@@ -27,12 +31,12 @@ fn get_lints(&self) -> LintArray {
     }
 }
 
-impl LateLintPass for MutMut {
-    fn check_block(&mut self, cx: &LateContext, block: &hir::Block) {
+impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MutMut {
+    fn check_block(&mut self, cx: &LateContext<'a, 'tcx>, block: &'tcx hir::Block) {
         intravisit::walk_block(&mut MutVisitor { cx: cx }, block);
     }
 
-    fn check_ty(&mut self, cx: &LateContext, ty: &hir::Ty) {
+    fn check_ty(&mut self, cx: &LateContext<'a, 'tcx>, ty: &'tcx hir::Ty) {
         use rustc::hir::intravisit::Visitor;
 
         MutVisitor { cx: cx }.visit_ty(ty);
@@ -43,13 +47,13 @@ pub struct MutVisitor<'a, 'tcx: 'a> {
     cx: &'a LateContext<'a, 'tcx>,
 }
 
-impl<'a, 'tcx, 'v> intravisit::Visitor<'v> for MutVisitor<'a, 'tcx> {
-    fn visit_expr(&mut self, expr: &'v hir::Expr) {
+impl<'a, 'tcx> intravisit::Visitor<'tcx> for MutVisitor<'a, 'tcx> {
+    fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
         if in_external_macro(self.cx, expr.span) {
             return;
         }
 
-        if let Some((_, arg, body)) = recover_for_loop(expr) {
+        if let Some((_, arg, body)) = higher::for_loop(expr) {
             // A `for` loop lowers to:
             // ```rust
             // match ::std::iter::Iterator::next(&mut iter) {
@@ -61,7 +65,7 @@ fn visit_expr(&mut self, expr: &'v hir::Expr) {
         } else if let hir::ExprAddrOf(hir::MutMutable, ref e) = expr.node {
             if let hir::ExprAddrOf(hir::MutMutable, _) = e.node {
                 span_lint(self.cx, MUT_MUT, expr.span, "generally you want to avoid `&mut &mut _` if possible");
-            } else if let TyRef(_, TypeAndMut { mutbl: hir::MutMutable, .. }) = self.cx.tcx.expr_ty(e).sty {
+            } else if let TyRef(_, TypeAndMut { mutbl: hir::MutMutable, .. }) = self.cx.tcx.tables().expr_ty(e).sty {
                 span_lint(self.cx,
                           MUT_MUT,
                           expr.span,
@@ -70,7 +74,7 @@ fn visit_expr(&mut self, expr: &'v hir::Expr) {
         }
     }
 
-    fn visit_ty(&mut self, ty: &hir::Ty) {
+    fn visit_ty(&mut self, ty: &'tcx hir::Ty) {
         if let hir::TyRptr(_, hir::MutTy { ty: ref pty, mutbl: hir::MutMutable }) = ty.node {
             if let hir::TyRptr(_, hir::MutTy { mutbl: hir::MutMutable, .. }) = pty.node {
                 span_lint(self.cx, MUT_MUT, ty.span, "generally you want to avoid `&mut &mut _` if possible");
@@ -80,4 +84,7 @@ fn visit_ty(&mut self, ty: &hir::Ty) {
 
         intravisit::walk_ty(self, ty);
     }
+    fn nested_visit_map<'this>(&'this mut self) -> intravisit::NestedVisitorMap<'this, 'tcx> {
+        intravisit::NestedVisitorMap::All(&self.cx.tcx.map)
+    }
 }