Skip to content

Commit 699fc80

Browse files
author
Ariel Ben-Yehuda
committed
Address review comments
1 parent c68e652 commit 699fc80

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/librustc/middle/traits/project.rs

+2
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@ fn confirm_impl_candidate<'cx,'tcx>(
859859
// there don't seem to be nicer accessors to these:
860860
let impl_or_trait_items_map = selcx.tcx().impl_or_trait_items.borrow();
861861

862+
// Look for the associated type in the impl
862863
for impl_item in &selcx.tcx().impl_items.borrow()[&impl_vtable.impl_def_id] {
863864
if let ty::TypeTraitItem(ref assoc_ty) = impl_or_trait_items_map[&impl_item.def_id()] {
864865
if assoc_ty.name == obligation.predicate.item_name {
@@ -868,6 +869,7 @@ fn confirm_impl_candidate<'cx,'tcx>(
868869
}
869870
}
870871

872+
// It is not in the impl - get the default from the trait.
871873
let trait_ref = obligation.predicate.trait_ref;
872874
for trait_item in ty::trait_items(selcx.tcx(), trait_ref.def_id).iter() {
873875
if let &ty::TypeTraitItem(ref assoc_ty) = trait_item {

0 commit comments

Comments
 (0)