Merge pull request #1711 from Manishearth/rustup

Rustup to *rustc 1.19.0-nightly (06fb4d256 2017-04-30)* and bump to 0.0.129
This commit is contained in:
Martin Carton 2017-05-01 14:35:26 +02:00 committed by GitHub
commit b20db1aede
5 changed files with 11 additions and 8 deletions

View File

@ -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

View File

@ -1,6 +1,6 @@
[package]
name = "clippy"
version = "0.0.128"
version = "0.0.129"
authors = [
"Manish Goregaokar <manishsmail@gmail.com>",
"Andre Bogus <bogusandre@gmail.com>",
@ -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"

View File

@ -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 <manishsmail@gmail.com>",

View File

@ -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));

View File

@ -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);
}