Skip to content

Commit df7d376

Browse files
erickterickt
committed
Convert ast::def_id into a struct.
1 parent bea67bd commit df7d376

File tree

11 files changed

+39
-28
lines changed

11 files changed

+39
-28
lines changed

‎src/librustc/metadata/decoder.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,15 @@ fn item_parent_item(d: ebml::Doc) -> Option<ast::def_id> {
218218
fn translated_parent_item_opt(cnum: ast::crate_num, d: ebml::Doc) ->
219219
Option<ast::def_id> {
220220
let trait_did_opt = item_parent_item(d);
221-
trait_did_opt.map(|trait_did| {crate: cnum, node: trait_did.node})
221+
do trait_did_opt.map |trait_did| {
222+
ast::def_id { crate: cnum, node: trait_did.node }
223+
}
222224
}
223225

224226
fn item_reqd_and_translated_parent_item(cnum: ast::crate_num,
225227
d: ebml::Doc) -> ast::def_id {
226228
let trait_did = item_parent_item(d).expect(~"item without parent");
227-
{crate: cnum, node: trait_did.node}
229+
ast::def_id { crate: cnum, node: trait_did.node }
228230
}
229231

230232
fn item_def_id(d: ebml::Doc, cdata: cmd) -> ast::def_id {
@@ -313,7 +315,7 @@ fn enum_variant_ids(item: ebml::Doc, cdata: cmd) -> ~[ast::def_id] {
313315
let v = tag_items_data_item_variant;
314316
for reader::tagged_docs(item, v) |p| {
315317
let ext = reader::with_doc_data(p, |d| parse_def_id(d));
316-
ids.push({crate: cdata.cnum, node: ext.node});
318+
ids.push(ast::def_id { crate: cdata.cnum, node: ext.node });
317319
};
318320
return ids;
319321
}
@@ -384,7 +386,7 @@ fn item_to_def_like(item: ebml::Doc, did: ast::def_id, cnum: ast::crate_num)
384386
fn lookup_def(cnum: ast::crate_num, data: @~[u8], did_: ast::def_id) ->
385387
ast::def {
386388
let item = lookup_item(did_.node, data);
387-
let did = {crate: cnum, node: did_.node};
389+
let did = ast::def_id { crate: cnum, node: did_.node };
388390
// We treat references to enums as references to types.
389391
return def_like_to_def(item_to_def_like(item, did, cnum));
390392
}
@@ -393,7 +395,8 @@ fn get_type(cdata: cmd, id: ast::node_id, tcx: ty::ctxt)
393395
-> ty::ty_param_bounds_and_ty {
394396

395397
let item = lookup_item(id, cdata.data);
396-
let t = item_type({crate: cdata.cnum, node: id}, item, tcx, cdata);
398+
let t = item_type(ast::def_id { crate: cdata.cnum, node: id }, item, tcx,
399+
cdata);
397400
let tp_bounds = if family_has_type_params(item_family(item)) {
398401
item_ty_param_bounds(item, tcx, cdata)
399402
} else { @~[] };
@@ -640,8 +643,8 @@ fn get_enum_variants(intr: @ident_interner, cdata: cmd, id: ast::node_id,
640643
let mut disr_val = 0;
641644
for variant_ids.each |did| {
642645
let item = find_item(did.node, items);
643-
let ctor_ty = item_type({crate: cdata.cnum, node: id}, item,
644-
tcx, cdata);
646+
let ctor_ty = item_type(ast::def_id { crate: cdata.cnum, node: id},
647+
item, tcx, cdata);
645648
let name = item_name(intr, item);
646649
let arg_tys = match ty::get(ctor_ty).sty {
647650
ty::ty_fn(ref f) => (*f).sig.inputs.map(|a| a.ty),
@@ -1141,11 +1144,11 @@ fn list_crate_metadata(intr: @ident_interner, bytes: @~[u8],
11411144
// crate to the correct local crate number.
11421145
fn translate_def_id(cdata: cmd, did: ast::def_id) -> ast::def_id {
11431146
if did.crate == ast::local_crate {
1144-
return {crate: cdata.cnum, node: did.node};
1147+
return ast::def_id { crate: cdata.cnum, node: did.node };
11451148
}
11461149

11471150
match cdata.cnum_map.find(did.crate) {
1148-
option::Some(n) => return {crate: n, node: did.node},
1151+
option::Some(n) => ast::def_id { crate: n, node: did.node },
11491152
option::None => fail ~"didn't find a crate in the cnum_map"
11501153
}
11511154
}

‎src/librustc/metadata/encoder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,8 @@ fn encode_enum_variant_info(ecx: @encode_ctxt, ebml_w: writer::Encoder,
273273
ty_params: ~[ty_param]) {
274274
let mut disr_val = 0;
275275
let mut i = 0;
276-
let vi = ty::enum_variants(ecx.tcx, {crate: local_crate, node: id});
276+
let vi = ty::enum_variants(ecx.tcx,
277+
ast::def_id { crate: local_crate, node: id });
277278
for variants.each |variant| {
278279
index.push({val: variant.node.id, pos: ebml_w.writer.tell()});
279280
ebml_w.start_tag(tag_items_data_item);

‎src/librustc/metadata/tydecode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ fn parse_def_id(buf: &[u8]) -> ast::def_id {
470470
None => fail (fmt!("internal error: parse_def_id: id expected, but \
471471
found %?", def_part))
472472
};
473-
return {crate: crate_num, node: def_num};
473+
ast::def_id { crate: crate_num, node: def_num }
474474
}
475475

476476
fn parse_bounds_data(data: @~[u8], start: uint,

‎src/librustc/middle/astencode.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ impl extended_decode_ctxt {
176176
}
177177
fn tr_intern_def_id(did: ast::def_id) -> ast::def_id {
178178
assert did.crate == ast::local_crate;
179-
{crate: ast::local_crate, node: self.tr_id(did.node)}
179+
ast::def_id { crate: ast::local_crate, node: self.tr_id(did.node) }
180180
}
181181
fn tr_span(_span: span) -> span {
182182
ast_util::dummy_sp() // FIXME (#1972): handle span properly
@@ -785,7 +785,7 @@ fn encode_side_tables_for_id(ecx: @e::encode_ctxt,
785785
}
786786
}
787787

788-
let lid = {crate: ast::local_crate, node: id};
788+
let lid = ast::def_id { crate: ast::local_crate, node: id };
789789
do option::iter(&tcx.tcache.find(lid)) |tpbt| {
790790
do ebml_w.tag(c::tag_table_tcache) {
791791
ebml_w.id(id);
@@ -988,7 +988,7 @@ fn decode_side_tables(xcx: extended_decode_ctxt,
988988
dcx.tcx.freevars.insert(id, fv_info);
989989
} else if tag == (c::tag_table_tcache as uint) {
990990
let tpbt = val_dsr.read_ty_param_bounds_and_ty(xcx);
991-
let lid = {crate: ast::local_crate, node: id};
991+
let lid = ast::def_id { crate: ast::local_crate, node: id };
992992
dcx.tcx.tcache.insert(lid, tpbt);
993993
} else if tag == (c::tag_table_param_bounds as uint) {
994994
let bounds = val_dsr.read_bounds(xcx);

‎src/librustc/middle/lang_items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ impl LanguageItemCollector {
359359
do iter_crate_data(crate_store) |crate_number, _crate_metadata| {
360360
for each_lang_item(crate_store, crate_number)
361361
|node_id, item_index| {
362-
let def_id = { crate: crate_number, node: node_id };
362+
let def_id = def_id { crate: crate_number, node: node_id };
363363
self.collect_item(item_index, def_id);
364364
}
365365
}

‎src/librustc/middle/resolve.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ fn Resolver(session: Session, lang_items: LanguageItems,
817817

818818
(*graph_root).define_module(Public,
819819
NoParentLink,
820-
Some({ crate: 0, node: 0 }),
820+
Some(def_id { crate: 0, node: 0 }),
821821
NormalModuleKind,
822822
has_legacy_export_attr(crate.node.attrs),
823823
crate.span);
@@ -1148,7 +1148,7 @@ impl Resolver {
11481148
self.add_child(ident, parent, ForbidDuplicateModules, sp);
11491149

11501150
let parent_link = self.get_parent_link(new_parent, ident);
1151-
let def_id = { crate: 0, node: item.id };
1151+
let def_id = def_id { crate: 0, node: item.id };
11521152
(*name_bindings).define_module(privacy,
11531153
parent_link,
11541154
Some(def_id),
@@ -1172,7 +1172,7 @@ impl Resolver {
11721172

11731173
let parent_link = self.get_parent_link(new_parent,
11741174
ident);
1175-
let def_id = { crate: 0, node: item.id };
1175+
let def_id = def_id { crate: 0, node: item.id };
11761176
(*name_bindings).define_module(privacy,
11771177
parent_link,
11781178
Some(def_id),
@@ -1609,7 +1609,7 @@ impl Resolver {
16091609
self.add_child(name, parent, ForbidDuplicateTypes,
16101610
view_item.span);
16111611

1612-
let def_id = { crate: crate_id, node: 0 };
1612+
let def_id = def_id { crate: crate_id, node: 0 };
16131613
let parent_link = ModuleParentLink
16141614
(self.get_module_from_parent(new_parent), name);
16151615

‎src/librustc/middle/trans/base.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2498,8 +2498,9 @@ fn trans_constant(ccx: @crate_ctxt, it: @ast::item) {
24982498
let _icx = ccx.insn_ctxt("trans_constant");
24992499
match it.node {
25002500
ast::item_enum(ref enum_definition, _) => {
2501-
let vi = ty::enum_variants(ccx.tcx, {crate: ast::local_crate,
2502-
node: it.id});
2501+
let vi = ty::enum_variants(ccx.tcx,
2502+
ast::def_id { crate: ast::local_crate,
2503+
node: it.id });
25032504
let mut i = 0;
25042505
let path = item_path(ccx, it);
25052506
for vec::each((*enum_definition).variants) |variant| {

‎src/librustc/middle/typeck/coherence.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,8 @@ impl CoherenceChecker {
928928
do iter_crate_data(crate_store) |crate_number, _crate_metadata| {
929929
self.add_impls_for_module(impls_seen,
930930
crate_store,
931-
{ crate: crate_number, node: 0 });
931+
def_id { crate: crate_number,
932+
node: 0 });
932933

933934
for each_path(crate_store, crate_number) |path_entry| {
934935
match path_entry.def_like {

‎src/librustc/middle/typeck/collect.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ fn collect_item_types(ccx: @crate_ctxt, crate: @ast::crate) {
7373
match /*bad*/copy crate_item.node {
7474
ast::item_mod(m) => {
7575
for m.items.each |intrinsic_item| {
76-
let def_id = { crate: ast::local_crate,
77-
node: intrinsic_item.id };
76+
let def_id = ast::def_id { crate: ast::local_crate,
77+
node: intrinsic_item.id };
7878
let substs = {self_r: None, self_ty: None, tps: ~[]};
7979

8080
match intrinsic_item.node {
@@ -254,7 +254,7 @@ fn ensure_trait_methods(ccx: @crate_ctxt, id: ast::node_id, trait_ty: ty::t) {
254254
// build up a subst that shifts all of the parameters over
255255
// by one and substitute in a new type param for self
256256

257-
let dummy_defid = {crate: 0, node: 0};
257+
let dummy_defid = ast::def_id {crate: 0, node: 0};
258258

259259
let non_shifted_trait_tps = do vec::from_fn(trait_bounds.len()) |i| {
260260
ty::mk_param(ccx.tcx, i, dummy_defid)
@@ -458,7 +458,7 @@ fn compare_impl_method(tcx: ty::ctxt,
458458
let dummy_tps = do vec::from_fn((*trait_m.tps).len()) |i| {
459459
// hack: we don't know the def id of the impl tp, but it
460460
// is not important for unification
461-
ty::mk_param(tcx, i + impl_tps, {crate: 0, node: 0})
461+
ty::mk_param(tcx, i + impl_tps, ast::def_id {crate: 0, node: 0})
462462
};
463463
let trait_tps = trait_substs.tps.map(
464464
|t| replace_bound_self(tcx, *t, dummy_self_r));

‎src/libsyntax/ast.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,10 @@ type node_id = int;
9393

9494
#[auto_encode]
9595
#[auto_decode]
96-
type def_id = {crate: crate_num, node: node_id};
96+
struct def_id {
97+
crate: crate_num,
98+
node: node_id,
99+
}
97100

98101
impl def_id : cmp::Eq {
99102
pure fn eq(&self, other: &def_id) -> bool {

‎src/libsyntax/ast_util.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ pure fn path_name_i(idents: &[ident], intr: @token::ident_interner) -> ~str {
5454

5555
pure fn path_to_ident(p: @path) -> ident { vec::last(p.idents) }
5656

57-
pure fn local_def(id: node_id) -> def_id { {crate: local_crate, node: id} }
57+
pure fn local_def(id: node_id) -> def_id {
58+
ast::def_id { crate: local_crate, node: id }
59+
}
5860

5961
pure fn is_local(did: ast::def_id) -> bool { did.crate == local_crate }
6062

0 commit comments

Comments
 (0)