From 76041b8ffafa93ccd32b4fd8b5912151cbb066f7 Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Mon, 1 May 2017 13:43:16 +0200
Subject: [PATCH] Rustup to *rustc 1.19.0-nightly (06fb4d256 2017-04-30)*

---
 clippy_lints/src/len_zero.rs  | 6 +++---
 clippy_lints/src/lifetimes.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/clippy_lints/src/len_zero.rs b/clippy_lints/src/len_zero.rs
index e275787935e..ea68b53b57b 100644
--- a/clippy_lints/src/len_zero.rs
+++ b/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));
diff --git a/clippy_lints/src/lifetimes.rs b/clippy_lints/src/lifetimes.rs
index 57d7b1e843e..d29ef8200ec 100644
--- a/clippy_lints/src/lifetimes.rs
+++ b/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);
                         }