---

yaml
---
r: 23108
b: refs/heads/master
c: e82d2ef
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9a77a17e3b51f2185fbbab2a4a301d6572834c72
+refs/heads/master: e82d2ef7639252ba365427ea1ad0e285986b5bf8
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/typeck/coherence.rs

@@ -288,24 +288,24 @@ class CoherenceChecker {
         }
 
         for associated_traits.each |associated_trait| {
-            let def = self.crate_context.tcx.def_map.get
-                (associated_trait.ref_id);
+            let trait_did =
+                self.trait_ref_to_trait_def_id(associated_trait);
             debug!{"(checking implementation) adding impl for trait \
                     '%s', item '%s'",
                    ast_map::node_id_to_str(self.crate_context.tcx.items,
-                                           associated_trait.ref_id),
+                                           trait_did.node),
                    *item.ident};
 
             let implementation = self.create_impl_from_item(item);
-            self.add_trait_method(def_id_of_def(def), implementation);
+            self.add_trait_method(trait_did, implementation);
         }
 
         // Add the implementation to the mapping from implementation to base
         // type def ID, if there is a base type for this implementation.
 
         match get_base_type_def_id(self.inference_context,
-                                 item.span,
-                                 self_type.ty) {
+                                   item.span,
+                                   self_type.ty) {
             none => {
                 // Nothing to do.
             }