---

yaml
---
r: 30236
b: refs/heads/incoming
c: 6d8d258
h: refs/heads/master
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: 5236a304c46f6f08bf43f08187e071c77c6622f5
+refs/heads/incoming: 6d8d258f35321ed257d76d5e3c6458eed00ba574
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/base.rs

@@ -2567,7 +2567,7 @@ fn lookup_discriminant(ccx: @crate_ctxt, vid: ast::def_id) -> ValueRef {
 }
 
 // This shouldn't exist. We should cast self *once*, but right now this
-// conflicts with default methods.
+// conflicts with default methods.  (FIXME: #2794)
 fn cast_self(cx: block, slf: val_self_data) -> ValueRef {
     PointerCast(cx, slf.v, T_ptr(type_of(cx.ccx(), slf.t)))
 }

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

@@ -14,6 +14,8 @@
 // call the `super_X(foo, ...)` functions directly, but rather call
 // `foo.X(...)`.  The implementation of `X()` can then choose to delegate
 // to the `super` routine or to do other things.
+// (FIXME (#2794): revise this paragraph once default methods in traits
+// are working.)
 //
 // In reality, the sub operation is rather different from lub/glb, but
 // they are combined into one trait to avoid duplication (they used to

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

@@ -128,7 +128,7 @@ impl Glb: combine {
         lattice_tys(&self, a, b)
     }
 
-    // Traits please:
+    // Traits please (FIXME: #2794):
 
     fn flds(a: ty::field, b: ty::field) -> cres<ty::field> {
         super_flds(&self, a, b)

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

@@ -103,7 +103,7 @@ impl Lub: combine {
         }
     }
 
-    // Traits please:
+    // Traits please (FIXME: #2794):
 
     fn tys(a: ty::t, b: ty::t) -> cres<ty::t> {
         lattice_tys(&self, a, b)

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

@@ -165,7 +165,7 @@ impl Sub: combine {
         super_fns(&self, &a_fn_ty, &b_fn_ty)
     }
 
-    // Traits please:
+    // Traits please (FIXME: #2794):
 
     fn flds(a: ty::field, b: ty::field) -> cres<ty::field> {
         super_flds(&self, a, b)

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

@@ -1,6 +1,6 @@
 //xfail-test
 
-// Currently failing with an ICE in trans.
+// Currently failing with an ICE in trans.  (FIXME: #2794)
 
 trait Cat {
     fn meow() -> bool;