---

yaml
---
r: 218743
b: refs/heads/snap-stage3
c: 699fc80
h: refs/heads/master
i:
  218741: f1e5f24
  218739: 6f2be2d
  218735: 1cd7ae6
v: v3

Author: Ariel Ben-Yehuda

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: c68e65251c86ffdb21aecec56ec45e303d952d79
+refs/heads/snap-stage3: 699fc80780b50d302a74475ff9240995d8117516
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/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 {