auto merge of #8519 : msullivan/rust/objects, r=catamorphism

r?

1 files changed, 12 insertions, 2 deletions

diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs
index 5ba52326579..0fdcac26ac8 100644
--- a/src/librustc/util/ppaux.rs
+++ b/src/librustc/util/ppaux.rs
@@ -747,8 +747,8 @@ impl Repr for typeck::method_origin {
             &typeck::method_param(ref p) => {
                 p.repr(tcx)
             }
-            &typeck::method_trait(def_id, n) => {
-                fmt!("method_trait(%s, %?)", def_id.repr(tcx), n)
+            &typeck::method_object(ref p) => {
+                p.repr(tcx)
             }
         }
     }
@@ -764,6 +764,16 @@ impl Repr for typeck::method_param {
     }
 }
 
+impl Repr for typeck::method_object {
+    fn repr(&self, tcx: ctxt) -> ~str {
+        fmt!("method_object(%s,%?,%?)",
+             self.trait_id.repr(tcx),
+             self.method_num,
+             self.real_index)
+    }
+}
+
+
 impl Repr for ty::RegionVid {
     fn repr(&self, _tcx: ctxt) -> ~str {
         fmt!("%?", *self)