---

yaml
---
r: 39280
b: refs/heads/incoming
c: ecdc8aa
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 2fcf562d163e57acdc4a7e5b0504df2dea6e34e6
+refs/heads/incoming: ecdc8aae4193a4306b379803897ff367f1f65379
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/typeck/collect.rs

@@ -647,9 +647,6 @@ fn convert_struct(ccx: @crate_ctxt,
     let cms = convert_methods(ccx, struct_def.methods, rp, bounds);
     for struct_def.traits.each |trait_ref| {
         check_methods_against_trait(ccx, tps, rp, selfty, *trait_ref, cms);
-        // trait_ref.impl_id represents (class, trait) pair
-        write_ty_to_tcx(tcx, trait_ref.impl_id, tpt.ty);
-        tcx.tcache.insert(local_def(trait_ref.impl_id), tpt);
     }
 
     // If this struct is enum-like or tuple-like, create the type of its

branches/incoming/src/libsyntax/ast.rs

@@ -1417,7 +1417,7 @@ type attribute_ = {style: attr_style, value: meta_item, is_sugared_doc: bool};
  */
 #[auto_serialize]
 #[auto_deserialize]
-type trait_ref = {path: @path, ref_id: node_id, impl_id: node_id};
+type trait_ref = {path: @path, ref_id: node_id};
 
 #[auto_serialize]
 #[auto_deserialize]

branches/incoming/src/libsyntax/ast_map.rs

@@ -254,9 +254,6 @@ fn map_item(i: @item, cx: ctx, v: vt) {
         // so we can find the self_ty
         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));
         }
         for (*methods).each |tm| {
             let id = ast_util::trait_method_to_ty_method(*tm).id;
@@ -282,9 +279,6 @@ fn map_struct_def(struct_def: @ast::struct_def, parent_node: ast_node,
     // so we can find the self_ty
     for struct_def.traits.each |p| {
         cx.map.insert(p.ref_id, parent_node);
-        // This is so we can look up the right things when
-        // encoding/decoding
-        cx.map.insert(p.impl_id, parent_node);
     }
     let d_id = ast_util::local_def(id);
     let p = extend(cx, ident);

branches/incoming/src/libsyntax/ext/auto_serialize.rs

@@ -393,7 +393,6 @@ fn mk_impl(
     let opt_trait = Some(@{
         path: path,
         ref_id: cx.next_id(),
-        impl_id: cx.next_id(),
     });
 
     let ty = cx.ty_path(

branches/incoming/src/libsyntax/ext/deriving.rs

@@ -220,8 +220,7 @@ fn create_derived_impl(cx: ext_ctxt,
     let trait_path = @move trait_path;
     let trait_ref = {
         path: trait_path,
-        ref_id: cx.next_id(),
-        impl_id: cx.next_id(),
+        ref_id: cx.next_id()
     };
     let trait_ref = @move trait_ref;
 

branches/incoming/src/libsyntax/fold.rs

@@ -280,8 +280,7 @@ fn fold_struct_def(struct_def: @ast::struct_def, fld: ast_fold)
 }
 
 fn fold_trait_ref(&&p: @trait_ref, fld: ast_fold) -> @trait_ref {
-    @{path: fld.fold_path(p.path), ref_id: fld.new_id(p.ref_id),
-     impl_id: fld.new_id(p.impl_id)}
+    @{path: fld.fold_path(p.path), ref_id: fld.new_id(p.ref_id)}
 }
 
 fn fold_struct_field(&&f: @struct_field, fld: ast_fold) -> @struct_field {

branches/incoming/src/libsyntax/parse/parser.rs

@@ -2821,7 +2821,7 @@ impl Parser {
 
     fn parse_trait_ref() -> @trait_ref {
         @{path: self.parse_path_with_tps(false),
-          ref_id: self.get_id(), impl_id: self.get_id()}
+          ref_id: self.get_id()}
     }
 
     fn parse_trait_ref_list(ket: token::Token) -> ~[@trait_ref] {