---

yaml
---
r: 27875
b: refs/heads/try
c: 280dfd2
h: refs/heads/master
i:
  27873: d305807
  27871: 651aa07
v: v3

Author: lkuper

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 3a5c7f52cc089214c936f409b3f97d6bda377d84
+refs/heads/try: 280dfd2d29c7c7adeeef9b02f85a101ea3a5bde6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/middle/typeck/check/method.rs

@@ -140,6 +140,26 @@ struct lookup {
               ty::ty_class(did, substs) => {
                 self.add_candidates_from_class(did, substs);
               }
+              ty::ty_self => {
+                // Call is of the form "self.foo()" and appears in one
+                // of a trait's provided methods.
+                let self_def_id = match self.fcx.self_info {
+                  some(self_info) => self_info.def_id,
+                  none => {
+                    // Shouldn't happen; there should always be a
+                    // self_info in this case.
+                    self.tcx().sess.bug(~"unexpected `none` for self_info")
+                  }
+                };
+
+                let substs = {
+                    self_r: none,
+                    self_ty: none,
+                    tps: ~[],
+                };
+
+                self.add_candidates_from_trait(self_def_id, substs);
+              }
               _ => ()
             }
 

branches/try/src/test/run-pass/traits-default-method-self.rs

@@ -1,8 +1,6 @@
 //xfail-test
 
-// Right now, this fails with "attempted access of field `purr` on
-// type `self`, but no public field or method with that name was
-// found".
+// Currently failing with an ICE in trans.
 
 trait Cat {
     fn meow() -> bool;