Rustup to *rustc 1.19.0-nightly (06fb4d2 2017-04-30)*

Author: mcarton

clippy_lints/src/len_zero.rs

@@ -199,9 +199,9 @@ fn has_is_empty(cx: &LateContext, expr: &Expr) -> bool {
 
     /// Check the inherent impl's items for an `is_empty(self)` method.
     fn has_is_empty_impl(cx: &LateContext, id: DefId) -> bool {
-        cx.tcx.maps.inherent_impls.borrow().get(&id).map_or(false, |impls| {
-            impls.iter().any(|imp| cx.tcx.associated_items(*imp).any(|item| is_is_empty(cx, &item)))
-        })
+        cx.tcx.inherent_impls(id)
+            .iter()
+            .any(|imp| cx.tcx.associated_items(*imp).any(|item| is_is_empty(cx, &item)))
     }
 
     let ty = &walk_ptrs_ty(cx.tables.expr_ty(expr));

clippy_lints/src/lifetimes.rs

@@ -287,7 +287,7 @@ impl<'v, 't> RefVisitor<'v, 't> {
                         }
                     },
                     Def::Trait(def_id) => {
-                        let trait_def = self.cx.tcx.maps.trait_def.borrow()[&def_id];
+                        let trait_def = self.cx.tcx.trait_def(def_id);
                         for _ in &self.cx.tcx.generics_of(trait_def.def_id).regions {
                             self.record(&None);
                         }