squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

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

Browse source
This commit is contained in:
mcarton 2017-05-01 13:43:16 +02:00
parent 50c8d4e270
commit 76041b8ffa
No known key found for this signature in database
GPG key ID: 5E427C794CBA45E8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clippy_lints/src/len_zero.rs
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. /// Check the inherent impl's items for an `is_empty(self)` method.
fn has_is_empty_impl(cx: &LateContext, id: DefId) -> bool { fn has_is_empty_impl(cx: &LateContext, id: DefId) -> bool {
cx.tcx.maps.inherent_impls.borrow().get(&id).map_or(false, |impls| { cx.tcx.inherent_impls(id)
impls.iter().any(|imp| cx.tcx.associated_items(*imp).any(|item| is_is_empty(cx, &item))) .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)); let ty = &walk_ptrs_ty(cx.tables.expr_ty(expr));

2
clippy_lints/src/lifetimes.rs
View file

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