---

Ariel Ben-Yehuda · Ariel Ben-Yehuda · commit 3482d103a09f · 2015-05-27T20:42:42.000+03:00
yaml --- r: 211701 b: refs/heads/auto c: 699fc80 h: refs/heads/master i: 211699: e81c628 v: v3
diff --git a/[refs] b/[refs]
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: c68e65251c86ffdb21aecec56ec45e303d952d79
+refs/heads/auto: 699fc80780b50d302a74475ff9240995d8117516
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc/middle/traits/project.rs b/branches/auto/src/librustc/middle/traits/project.rs
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -859,6 +859,7 @@ fn confirm_impl_candidate<'cx,'tcx>(`
`859`	`859`	`// there don't seem to be nicer accessors to these:`
`860`	`860`	`let impl_or_trait_items_map = selcx.tcx().impl_or_trait_items.borrow();`
`861`	`861`
	`862`	`+ // Look for the associated type in the impl`
`862`	`863`	`for impl_item in &selcx.tcx().impl_items.borrow()[&impl_vtable.impl_def_id] {`
`863`	`864`	`if let ty::TypeTraitItem(ref assoc_ty) = impl_or_trait_items_map[&impl_item.def_id()] {`
`864`	`865`	`if assoc_ty.name == obligation.predicate.item_name {`
`@@ -868,6 +869,7 @@ fn confirm_impl_candidate<'cx,'tcx>(`
`868`	`869`	`}`
`869`	`870`	`}`
`870`	`871`
	`872`	`+ // It is not in the impl - get the default from the trait.`
`871`	`873`	`let trait_ref = obligation.predicate.trait_ref;`
`872`	`874`	`for trait_item in ty::trait_items(selcx.tcx(), trait_ref.def_id).iter() {`
`873`	`875`	`if let &ty::TypeTraitItem(ref assoc_ty) = trait_item {`