user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address review comments

Browse source
This commit is contained in:
Ariel Ben-Yehuda 2015-05-27 20:42:42 +03:00
parent c68e65251c
commit 699fc80780
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc/middle/traits/project.rs
View file

@ -859,6 +859,7 @@ fn confirm_impl_candidate<'cx,'tcx>(
// there don't seem to be nicer accessors to these:
let impl_or_trait_items_map = selcx.tcx().impl_or_trait_items.borrow();
// Look for the associated type in the impl
for impl_item in &selcx.tcx().impl_items.borrow()[&impl_vtable.impl_def_id] {
if let ty::TypeTraitItem(ref assoc_ty) = impl_or_trait_items_map[&impl_item.def_id()] {
if assoc_ty.name == obligation.predicate.item_name {
@ -868,6 +869,7 @@ fn confirm_impl_candidate<'cx,'tcx>(
}
}
// It is not in the impl - get the default from the trait.
let trait_ref = obligation.predicate.trait_ref;
for trait_item in ty::trait_items(selcx.tcx(), trait_ref.def_id).iter() {
if let &ty::TypeTraitItem(ref assoc_ty) = trait_item {