diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-12-06 19:12:25 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-12-07 15:54:17 -0800 |
| commit | ecdc8aae4193a4306b379803897ff367f1f65379 (patch) | |
| tree | bcdee37054ae4c580f25c3cf1fc771d9343ab7cd /src/libsyntax | |
| parent | 2fcf562d163e57acdc4a7e5b0504df2dea6e34e6 (diff) | |
| download | rust-ecdc8aae4193a4306b379803897ff367f1f65379.tar.gz rust-ecdc8aae4193a4306b379803897ff367f1f65379.zip | |
Remove impl_id from trait_ref. Unused
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ast_map.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/ext/auto_serialize.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/fold.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
6 files changed, 4 insertions, 13 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 1e7e427a384..134f5e68e92 100644 --- a/src/libsyntax/ast.rs +++ b/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] diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs index d04447e8d73..6d6e10b717e 100644 --- a/src/libsyntax/ast_map.rs +++ b/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); diff --git a/src/libsyntax/ext/auto_serialize.rs b/src/libsyntax/ext/auto_serialize.rs index a42a51fd302..7a1b973c3a1 100644 --- a/src/libsyntax/ext/auto_serialize.rs +++ b/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( diff --git a/src/libsyntax/ext/deriving.rs b/src/libsyntax/ext/deriving.rs index b8bb9c20dc0..2aca54446d7 100644 --- a/src/libsyntax/ext/deriving.rs +++ b/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; diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index c69a2b62b18..59d4ac13ff2 100644 --- a/src/libsyntax/fold.rs +++ b/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 { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 86907706bbf..36f5bbe4819 100644 --- a/src/libsyntax/parse/parser.rs +++ b/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] { |
