Skip to content

Commit b20db1a

Browse files
authored
Merge pull request #1711 from Manishearth/rustup
Rustup to *rustc 1.19.0-nightly (06fb4d2 2017-04-30)* and bump to 0.0.129
2 parents 50c8d4e + 668d19b commit b20db1a

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4-
## 0.0.127 — 2017-04-28
4+
## 0.0.129 — 2017-05-01
5+
* Update to *rustc 1.19.0-nightly (06fb4d256 2017-04-30)*
6+
7+
## 0.0.128 — 2017-04-28
58
* Update to *rustc 1.18.0-nightly (94e884b63 2017-04-27)*
69

710
## 0.0.127 — 2017-04-27

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "clippy"
3-
version = "0.0.128"
3+
version = "0.0.129"
44
authors = [
55
"Manish Goregaokar <[email protected]>",
66
"Andre Bogus <[email protected]>",
@@ -30,7 +30,7 @@ test = false
3030

3131
[dependencies]
3232
# begin automatic update
33-
clippy_lints = { version = "0.0.128", path = "clippy_lints" }
33+
clippy_lints = { version = "0.0.129", path = "clippy_lints" }
3434
# end automatic update
3535
cargo_metadata = "0.1.1"
3636

clippy_lints/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "clippy_lints"
33
# begin automatic update
4-
version = "0.0.128"
4+
version = "0.0.129"
55
# end automatic update
66
authors = [
77
"Manish Goregaokar <[email protected]>",

clippy_lints/src/len_zero.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ fn has_is_empty(cx: &LateContext, expr: &Expr) -> bool {
199199

200200
/// Check the inherent impl's items for an `is_empty(self)` method.
201201
fn has_is_empty_impl(cx: &LateContext, id: DefId) -> bool {
202-
cx.tcx.maps.inherent_impls.borrow().get(&id).map_or(false, |impls| {
203-
impls.iter().any(|imp| cx.tcx.associated_items(*imp).any(|item| is_is_empty(cx, &item)))
204-
})
202+
cx.tcx.inherent_impls(id)
203+
.iter()
204+
.any(|imp| cx.tcx.associated_items(*imp).any(|item| is_is_empty(cx, &item)))
205205
}
206206

207207
let ty = &walk_ptrs_ty(cx.tables.expr_ty(expr));

clippy_lints/src/lifetimes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl<'v, 't> RefVisitor<'v, 't> {
287287
}
288288
},
289289
Def::Trait(def_id) => {
290-
let trait_def = self.cx.tcx.maps.trait_def.borrow()[&def_id];
290+
let trait_def = self.cx.tcx.trait_def(def_id);
291291
for _ in &self.cx.tcx.generics_of(trait_def.def_id).regions {
292292
self.record(&None);
293293
}

0 commit comments

Comments
 (0)