---

yaml
---
r: 29897
b: refs/heads/incoming
c: 280dfd2
h: refs/heads/master
i:
  29895: 86212b0
v: v3

Author: lkuper

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 3a5c7f52cc089214c936f409b3f97d6bda377d84
+refs/heads/incoming: 280dfd2d29c7c7adeeef9b02f85a101ea3a5bde6
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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/incoming/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;