about summary refs log tree commit diff
path: root/src/rustc
diff options
context:
space:
mode:
authorLindsey Kuper <lindsey@rockstargirl.org>2012-08-17 10:44:52 -0700
committerLindsey Kuper <lindsey@rockstargirl.org>2012-08-17 11:04:53 -0700
commit280dfd2d29c7c7adeeef9b02f85a101ea3a5bde6 (patch)
tree0a16a2dd35b2c06fba8bfc9b22633bc27b9d80b4 /src/rustc
parent3a5c7f52cc089214c936f409b3f97d6bda377d84 (diff)
downloadrust-280dfd2d29c7c7adeeef9b02f85a101ea3a5bde6.tar.gz
rust-280dfd2d29c7c7adeeef9b02f85a101ea3a5bde6.zip
Default methods with self-calls make it as far as trans.
Diffstat (limited to 'src/rustc')
-rw-r--r--src/rustc/middle/typeck/check/method.rs20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs
index 4e47b752449..9dd2cec043c 100644
--- a/src/rustc/middle/typeck/check/method.rs
+++ b/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);
+              }
               _ => ()
             }