Skip to content

Commit 6d8d258

Browse files
committed
Tag things that have to do with default methods with issue #2794.
1 parent 5236a30 commit 6d8d258

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

src/rustc/middle/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2567,7 +2567,7 @@ fn lookup_discriminant(ccx: @crate_ctxt, vid: ast::def_id) -> ValueRef {
25672567
}
25682568

25692569
// This shouldn't exist. We should cast self *once*, but right now this
2570-
// conflicts with default methods.
2570+
// conflicts with default methods. (FIXME: #2794)
25712571
fn cast_self(cx: block, slf: val_self_data) -> ValueRef {
25722572
PointerCast(cx, slf.v, T_ptr(type_of(cx.ccx(), slf.t)))
25732573
}

src/rustc/middle/typeck/infer/combine.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
// call the `super_X(foo, ...)` functions directly, but rather call
1515
// `foo.X(...)`. The implementation of `X()` can then choose to delegate
1616
// to the `super` routine or to do other things.
17+
// (FIXME (#2794): revise this paragraph once default methods in traits
18+
// are working.)
1719
//
1820
// In reality, the sub operation is rather different from lub/glb, but
1921
// they are combined into one trait to avoid duplication (they used to

src/rustc/middle/typeck/infer/glb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl Glb: combine {
128128
lattice_tys(&self, a, b)
129129
}
130130

131-
// Traits please:
131+
// Traits please (FIXME: #2794):
132132

133133
fn flds(a: ty::field, b: ty::field) -> cres<ty::field> {
134134
super_flds(&self, a, b)

src/rustc/middle/typeck/infer/lub.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl Lub: combine {
103103
}
104104
}
105105

106-
// Traits please:
106+
// Traits please (FIXME: #2794):
107107

108108
fn tys(a: ty::t, b: ty::t) -> cres<ty::t> {
109109
lattice_tys(&self, a, b)

src/rustc/middle/typeck/infer/sub.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ impl Sub: combine {
165165
super_fns(&self, &a_fn_ty, &b_fn_ty)
166166
}
167167

168-
// Traits please:
168+
// Traits please (FIXME: #2794):
169169

170170
fn flds(a: ty::field, b: ty::field) -> cres<ty::field> {
171171
super_flds(&self, a, b)

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

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

3-
// Currently failing with an ICE in trans.
3+
// Currently failing with an ICE in trans. (FIXME: #2794)
44

55
trait Cat {
66
fn meow() -> bool;

0 commit comments

Comments
 (0)