Skip to content

Commit 280dfd2

Browse files
committed
Default methods with self-calls make it as far as trans.
1 parent 3a5c7f5 commit 280dfd2

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,26 @@ struct lookup {
140140
ty::ty_class(did, substs) => {
141141
self.add_candidates_from_class(did, substs);
142142
}
143+
ty::ty_self => {
144+
// Call is of the form "self.foo()" and appears in one
145+
// of a trait's provided methods.
146+
let self_def_id = match self.fcx.self_info {
147+
some(self_info) => self_info.def_id,
148+
none => {
149+
// Shouldn't happen; there should always be a
150+
// self_info in this case.
151+
self.tcx().sess.bug(~"unexpected `none` for self_info")
152+
}
153+
};
154+
155+
let substs = {
156+
self_r: none,
157+
self_ty: none,
158+
tps: ~[],
159+
};
160+
161+
self.add_candidates_from_trait(self_def_id, substs);
162+
}
143163
_ => ()
144164
}
145165

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//xfail-test
22

3-
// Right now, this fails with "attempted access of field `purr` on
4-
// type `self`, but no public field or method with that name was
5-
// found".
3+
// Currently failing with an ICE in trans.
64

75
trait Cat {
86
fn meow() -> bool;

0 commit comments

Comments
 (0)