From e644ca0d6a61f243c8a3cb9708bae6da216bc5de Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 7 Jan 2015 20:53:02 +0100 Subject: [PATCH] push_impls_of_trait is not needed, use map --- src/librustc_typeck/coherence/overlap.rs | 28 ++++++++---------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/src/librustc_typeck/coherence/overlap.rs b/src/librustc_typeck/coherence/overlap.rs index f618a79e27d..e0bf6f86571 100644 --- a/src/librustc_typeck/coherence/overlap.rs +++ b/src/librustc_typeck/coherence/overlap.rs @@ -38,16 +38,18 @@ fn check_for_overlapping_impls(&self) { // check_for_overlapping_impls_of_trait() check, since that // check can populate this table further with impls from other // crates. - let trait_def_ids: Vec = - self.tcx.trait_impls.borrow().keys().map(|&d| d).collect(); + let trait_def_ids: Vec<(ast::DefId, Vec)> = + self.tcx.trait_impls.borrow().iter().map(|(&k, v)| + (k, v.borrow().clone())).collect(); - for trait_def_id in trait_def_ids.iter() { - self.check_for_overlapping_impls_of_trait(*trait_def_id); + for &(trait_def_id, ref impls) in trait_def_ids.iter() { + self.check_for_overlapping_impls_of_trait(trait_def_id, impls); } } fn check_for_overlapping_impls_of_trait(&self, - trait_def_id: ast::DefId) + trait_def_id: ast::DefId, + trait_impls: &Vec) { debug!("check_for_overlapping_impls_of_trait(trait_def_id={})", trait_def_id.repr(self.tcx)); @@ -57,17 +59,14 @@ fn check_for_overlapping_impls_of_trait(&self, ty::populate_implementations_for_trait_if_necessary(self.tcx, trait_def_id); - let mut impls = Vec::new(); - self.push_impls_of_trait(trait_def_id, &mut impls); - - for (i, &impl1_def_id) in impls.iter().enumerate() { + for (i, &impl1_def_id) in trait_impls.iter().enumerate() { if impl1_def_id.krate != ast::LOCAL_CRATE { // we don't need to check impls if both are external; // that's the other crate's job. continue; } - for &impl2_def_id in impls.slice_from(i+1).iter() { + for &impl2_def_id in trait_impls.slice_from(i+1).iter() { self.check_if_impls_overlap(trait_def_id, impl1_def_id, impl2_def_id); @@ -108,15 +107,6 @@ fn check_if_impls_overlap(&self, } } - fn push_impls_of_trait(&self, - trait_def_id: ast::DefId, - out: &mut Vec) { - match self.tcx.trait_impls.borrow().get(&trait_def_id) { - Some(impls) => { out.push_all(impls.borrow().as_slice()); } - None => { /* no impls */ } - } - } - fn span_of_impl(&self, impl_did: ast::DefId) -> Span { assert_eq!(impl_did.krate, ast::LOCAL_CRATE); self.tcx.map.span(impl_did.node)