---

yaml
---
r: 23202
b: refs/heads/master
c: fb05f57
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 62a9e16cb20b070dba25fed585a14f9e3a62ac3b
+refs/heads/master: fb05f578817cd27124eaff2b202f4c1b56a7cb16
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/print/pprust.rs

@@ -838,11 +838,6 @@ fn print_block_unclosed(s: ps, blk: ast::blk) {
                                  false);
 }
 
-fn print_block_unclosed_indent(s: ps, blk: ast::blk, indented: uint) {
-    print_possibly_embedded_block_(s, blk, block_normal, indented, ~[],
-                                   false);
-}
-
 fn print_block_with_attrs(s: ps, blk: ast::blk, attrs: ~[ast::attribute]) {
     print_possibly_embedded_block_(s, blk, block_normal, indent_unit, attrs,
                                   true);
@@ -1183,16 +1178,8 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
             assert arm.body.node.rules == ast::default_blk;
             match arm.body.node.expr {
               some(expr) => {
-                match expr.node {
-                  ast::expr_block(blk) => {
-                    // the block will close the pattern's ibox
-                    print_block_unclosed_indent(s, blk, alt_indent_unit);
-                  }
-                  _ => {
-                    end(s); // close the ibox for the pattern
-                    print_expr(s, expr);
-                  }
-                }
+                end(s); // close the ibox for the pattern
+                print_expr(s, expr);
                 if !expr_is_simple_block(expr)
                     && i < len - 1 {
                     word(s.s, ~",");

trunk/src/rustc/middle/trans/base.rs

@@ -5023,6 +5023,9 @@ fn trans_item(ccx: @crate_ctxt, item: ast::item) {
       ast::item_class(struct_def, tps) => {
         trans_struct_def(ccx, struct_def, tps, path, item.ident, item.id);
       }
+      ast::item_trait(tps, _, trait_methods) => {
+        trans_trait(ccx, tps, trait_methods, path, item.ident);
+      }
       _ => {/* fall through */ }
     }
 }
@@ -5051,6 +5054,14 @@ fn trans_struct_def(ccx: @crate_ctxt, struct_def: @ast::struct_def,
     impl::trans_impl(ccx, *path, ident, ms, tps);
 }
 
+fn trans_trait(ccx: @crate_ctxt, tps: ~[ast::ty_param],
+               trait_methods: ~[ast::trait_method],
+               path: @ast_map::path, ident: ast::ident) {
+    // Translate any methods that have provided implementations
+    let (_, provided_methods) = ast_util::split_trait_methods(trait_methods);
+    impl::trans_impl(ccx, *path, ident, provided_methods, tps);
+}
+
 // Translate a module. Doing this amounts to translating the items in the
 // module; there ends up being no artifact (aside from linkage names) of
 // separate modules in the compiled program.  That's because modules exist
@@ -5275,28 +5286,14 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
                                get_item_val()");
               }
               ast::provided(m) => {
-                // FIXME (#2794): Default methods currently compiling but not
-                // linking successfully; not sure if this is correct.  It's
-                // just copypasta from the node_method case.
                 exprt = true;
-                let mty = ty::node_id_to_type(ccx.tcx, id);
-                let pth =
-                    vec::append(*pth, ~[path_name(@ccx.names(~"meth")),
-                                        path_name(m.ident)]);
-                let llfn = register_fn_full(ccx, m.span, pth, id, mty);
-                set_inline_hint_if_appr(m.attrs, llfn);
-                llfn
+                trans_method(ccx, id, pth, m)
               }
             }
           }
-          ast_map::node_method(m, impl_id, pth) => {
+          ast_map::node_method(m, _, pth) => {
             exprt = true;
-            let mty = ty::node_id_to_type(ccx.tcx, id);
-            let pth = vec::append(*pth, ~[path_name(@ccx.names(~"meth")),
-                                          path_name(m.ident)]);
-            let llfn = register_fn_full(ccx, m.span, pth, id, mty);
-            set_inline_hint_if_appr(m.attrs, llfn);
-            llfn
+            trans_method(ccx, id, pth, m)
           }
           ast_map::node_foreign_item(ni, _, pth) => {
             exprt = true;
@@ -5336,7 +5333,7 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
                     assert args.len() != 0u;
                     let pth = vec::append(*pth,
                                           ~[path_name(enm.ident),
-                                           path_name(v.node.name)]);
+                                            path_name(v.node.name)]);
                     llfn = match check enm.node {
                       ast::item_enum(_, _) => {
                         register_fn(ccx, v.span, pth, id)
@@ -5366,6 +5363,16 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
     }
 }
 
+fn trans_method(ccx: @crate_ctxt, id: ast::node_id, pth: @ast_map::path,
+                m: @ast::method) -> ValueRef {
+    let mty = ty::node_id_to_type(ccx.tcx, id);
+    let pth = vec::append(*pth, ~[path_name(@ccx.names(~"meth")),
+                                  path_name(m.ident)]);
+    let llfn = register_fn_full(ccx, m.span, pth, id, mty);
+    set_inline_hint_if_appr(m.attrs, llfn);
+    llfn
+}
+
 // The constant translation pass.
 fn trans_constant(ccx: @crate_ctxt, it: @ast::item) {
     let _icx = ccx.insn_ctxt(~"trans_constant");

trunk/src/test/run-pass/traits-default-method-trivial.rs

@@ -1,5 +1,3 @@
-//xfail-test
-
 trait Cat {
     fn meow() -> bool;
     fn scratch() -> bool;