From 76041b8ffafa93ccd32b4fd8b5912151cbb066f7 Mon Sep 17 00:00:00 2001 From: mcarton Date: Mon, 1 May 2017 13:43:16 +0200 Subject: [PATCH 1/2] 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 e275787935e0..ea68b53b57b7 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 57d7b1e843e4..d29ef8200ec9 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); } From 668d19bda7364ab958108c045b72b483183f8efd Mon Sep 17 00:00:00 2001 From: mcarton Date: Mon, 1 May 2017 13:44:59 +0200 Subject: [PATCH 2/2] Bump the version --- CHANGELOG.md | 5 ++++- Cargo.toml | 4 ++-- clippy_lints/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1eec367069c..16307e5a2f33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. -## 0.0.127 — 2017-04-28 +## 0.0.129 — 2017-05-01 +* Update to *rustc 1.19.0-nightly (06fb4d256 2017-04-30)* + +## 0.0.128 — 2017-04-28 * Update to *rustc 1.18.0-nightly (94e884b63 2017-04-27)* ## 0.0.127 — 2017-04-27 diff --git a/Cargo.toml b/Cargo.toml index a983626bbc50..4ad24ffd9ee7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clippy" -version = "0.0.128" +version = "0.0.129" authors = [ "Manish Goregaokar ", "Andre Bogus ", @@ -30,7 +30,7 @@ test = false [dependencies] # begin automatic update -clippy_lints = { version = "0.0.128", path = "clippy_lints" } +clippy_lints = { version = "0.0.129", path = "clippy_lints" } # end automatic update cargo_metadata = "0.1.1" diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml index 04659e884e10..33564a8df231 100644 --- a/clippy_lints/Cargo.toml +++ b/clippy_lints/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "clippy_lints" # begin automatic update -version = "0.0.128" +version = "0.0.129" # end automatic update authors = [ "Manish Goregaokar ",