---

yaml
---
r: 31589
b: refs/heads/dist-snap
c: 2fe299d
h: refs/heads/master
i:
  31587: f68bc3d
v: v3

Author: msullivan

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 97452c0ca16238a2de5503aca07db26ff9e8ba63
+refs/heads/dist-snap: 2fe299d1a53355c9bb78b9067bd2d18bd4eb94e7
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/ast.rs

@@ -511,7 +511,7 @@ type ty_field = spanned<ty_field_>;
 #[auto_serialize]
 type ty_method = {ident: ident, attrs: ~[attribute],
                   decl: fn_decl, tps: ~[ty_param], self_ty: self_ty,
-                  span: span};
+                  id: node_id, span: span};
 
 #[auto_serialize]
 // A trait method is either required (meaning it doesn't have an

branches/dist-snap/src/libsyntax/ast_map.rs

@@ -35,6 +35,8 @@ fn path_to_str(p: path) -> ~str {
 enum ast_node {
     node_item(@item, @path),
     node_foreign_item(@foreign_item, foreign_abi, @path),
+    node_trait_method(@trait_method, def_id /* trait did */,
+                      @path /* path to the trait */),
     node_method(@method, def_id /* impl did */, @path /* path to the impl */),
     node_variant(variant, @item, @path),
     node_expr(@expr),
@@ -218,19 +220,24 @@ fn map_item(i: @item, cx: ctx, v: vt) {
           let (_, ms) = ast_util::split_class_items(items);
           // Map trait refs to their parent classes. This is
           // so we can find the self_ty
-          do vec::iter(traits) |p| { cx.map.insert(p.ref_id,
-                                  node_item(i, item_path));
-                            // This is so we can look up the right things when
-                            // encoding/decoding
-                            cx.map.insert(p.impl_id,
-                                          node_item(i, item_path));
-
-                           };
+          for traits.each |p| {
+              cx.map.insert(p.ref_id, node_item(i, item_path));
+              // This is so we can look up the right things when
+              // encoding/decoding
+              cx.map.insert(p.impl_id, node_item(i, item_path));
+          }
           let d_id = ast_util::local_def(i.id);
           let p = extend(cx, i.ident);
            // only need to handle methods
           do vec::iter(ms) |m| { map_method(d_id, p, m, cx); }
       }
+      item_trait(tps, methods) {
+        for methods.each |tm| {
+            let id = ast_util::trait_method_to_ty_method(tm).id;
+            let d_id = ast_util::local_def(i.id);
+            cx.map.insert(id, node_trait_method(@tm, d_id, item_path));
+        }
+      }
       _ { }
     }
     alt i.node {
@@ -283,6 +290,11 @@ fn node_id_to_str(map: map, id: node_id) -> ~str {
         fmt!{"method %s in %s (id=%?)",
              *m.ident, path_to_str(*path), id}
       }
+      some(node_trait_method(tm, impl_did, path)) {
+        let m = ast_util::trait_method_to_ty_method(*tm);
+        fmt!{"method %s in %s (id=%?)",
+             *m.ident, path_to_str(*path), id}
+      }
       some(node_variant(variant, def_id, path)) {
         fmt!{"variant %s in %s (id=%?)",
              *variant.node.name, path_to_str(*path), id}

branches/dist-snap/src/libsyntax/ast_util.rs

@@ -316,6 +316,19 @@ fn split_class_items(cs: ~[@class_member]) -> (~[ivar], ~[@method]) {
     (vs, ms)
 }
 
+// extract a ty_method from a trait_method. if the trait_method is
+// a default, pull out the useful fields to make a ty_method
+fn trait_method_to_ty_method(method: trait_method) -> ty_method {
+    alt method {
+      required(m) { m }
+      provided(m) {
+        {ident: m.ident, attrs: m.attrs,
+         decl: m.decl, tps: m.tps, self_ty: m.self_ty,
+         id: m.id, span: m.span}
+      }
+    }
+}
+
 pure fn class_member_visibility(ci: @class_member) -> visibility {
   alt ci.node {
      instance_var(_, _, _, _, vis) { vis }

branches/dist-snap/src/libsyntax/parse/parser.rs

@@ -291,7 +291,7 @@ class parser {
                 required({ident: ident, attrs: attrs,
                           decl: {purity: pur with d}, tps: tps,
                           self_ty: self_ty,
-                          span: mk_sp(lo, hi)})
+                          id: p.get_id(), span: mk_sp(lo, hi)})
               }
               token::LBRACE {
                 debug!{"parse_trait_methods(): parsing provided method"};

branches/dist-snap/src/rustc/middle/trans/base.rs

@@ -2111,6 +2111,9 @@ fn monomorphic_fn(ccx: @crate_ctxt, fn_id: ast::def_id,
       }
       ast_map::node_ctor(nm, _, ct, _, pt) { (pt, nm, ct.span) }
       ast_map::node_dtor(_, dtor, _, pt) {(pt, @~"drop", dtor.span)}
+      ast_map::node_trait_method(*) {
+        ccx.tcx.sess.bug(~"Can't monomorphize a trait method")
+      }
       ast_map::node_expr(*) {
         ccx.tcx.sess.bug(~"Can't monomorphize an expr")
       }
@@ -2207,6 +2210,9 @@ fn monomorphic_fn(ccx: @crate_ctxt, fn_id: ast::def_id,
       ast_map::node_expr(*) {
         ccx.tcx.sess.bug(~"Can't monomorphize an expr")
       }
+      ast_map::node_trait_method(*) {
+        ccx.tcx.sess.bug(~"Can't monomorphize a trait method")
+      }
       ast_map::node_export(*) {
           ccx.tcx.sess.bug(~"Can't monomorphize an export")
       }
@@ -2418,7 +2424,7 @@ fn trans_local_var(cx: block, def: ast::def) -> local_var_result {
         return {val: slf, kind: lv_owned};
       }
       _ {
-        cx.sess().unimpl(fmt!{"unsupported def type in trans_local_def: %?",
+        cx.sess().unimpl(fmt!{"unsupported def type in trans_local_var: %?",
                               def});
       }
     }

branches/dist-snap/src/rustc/middle/trans/impl.rs

@@ -185,6 +185,8 @@ fn resolve_vtables_in_fn_ctxt(fcx: fn_ctxt, vts: typeck::vtable_res)
     @vec::map(*vts, |d| resolve_vtable_in_fn_ctxt(fcx, d))
 }
 
+// Apply the typaram substitutions in the fn_ctxt to a vtable. This should
+// eliminate any vtable_params.
 fn resolve_vtable_in_fn_ctxt(fcx: fn_ctxt, vt: typeck::vtable_origin)
     -> typeck::vtable_origin {
     alt vt {

branches/dist-snap/src/rustc/middle/ty.rs

@@ -2759,6 +2759,10 @@ fn item_path(cx: ctxt, id: ast::def_id) -> ast_map::path {
           ast_map::node_method(method, _, path) {
             vec::append_one(*path, ast_map::path_name(method.ident))
           }
+          ast_map::node_trait_method(trait_method, _, path) {
+            let method = ast_util::trait_method_to_ty_method(*trait_method);
+            vec::append_one(*path, ast_map::path_name(method.ident))
+          }
 
           ast_map::node_variant(variant, _, path) {
             vec::append_one(vec::init(*path),