---

yaml
---
r: 211398
b: refs/heads/tmp
c: 699fc80
h: refs/heads/master
v: v3

Author: Ariel Ben-Yehuda

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 2d00dc3b85aaf81caa3a4e5764c5e185a4dd0a7c
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: c68e65251c86ffdb21aecec56ec45e303d952d79
+refs/heads/tmp: 699fc80780b50d302a74475ff9240995d8117516
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 704c2ee730d2e948d11a2edd77e3f35de8329a6e
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/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 {