Skip to content

Commit fb22315

Browse files
ljedrzljedrz
committed
hir: remove NodeId from VariantData
1 parent 50b8bc8 commit fb22315

File tree

10 files changed

+30
-40
lines changed

10 files changed

+30
-40
lines changed

‎src/librustc/hir/lowering.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2674,35 +2674,33 @@ impl<'a> LoweringContext<'a> {
26742674
fn lower_variant_data(&mut self, vdata: &VariantData) -> hir::VariantData {
26752675
match *vdata {
26762676
VariantData::Struct(ref fields, id) => {
2677-
let LoweredNodeId { node_id, hir_id } = self.lower_node_id(id);
2677+
let LoweredNodeId { node_id: _, hir_id } = self.lower_node_id(id);
26782678

26792679
hir::VariantData::Struct(
26802680
fields
26812681
.iter()
26822682
.enumerate()
26832683
.map(|f| self.lower_struct_field(f))
26842684
.collect(),
2685-
node_id,
26862685
hir_id,
26872686
)
26882687
},
26892688
VariantData::Tuple(ref fields, id) => {
2690-
let LoweredNodeId { node_id, hir_id } = self.lower_node_id(id);
2689+
let LoweredNodeId { node_id: _, hir_id } = self.lower_node_id(id);
26912690

26922691
hir::VariantData::Tuple(
26932692
fields
26942693
.iter()
26952694
.enumerate()
26962695
.map(|f| self.lower_struct_field(f))
26972696
.collect(),
2698-
node_id,
26992697
hir_id,
27002698
)
27012699
},
27022700
VariantData::Unit(id) => {
2703-
let LoweredNodeId { node_id, hir_id } = self.lower_node_id(id);
2701+
let LoweredNodeId { node_id: _, hir_id } = self.lower_node_id(id);
27042702

2705-
hir::VariantData::Unit(node_id, hir_id)
2703+
hir::VariantData::Unit(hir_id)
27062704
},
27072705
}
27082706
}

‎src/librustc/hir/map/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,11 @@ impl<'hir> Map<'hir> {
366366
}
367367
}
368368
Node::Variant(variant) => {
369-
let def_id = self.local_def_id(variant.node.data.id());
369+
let def_id = self.local_def_id_from_hir_id(variant.node.data.hir_id());
370370
Some(Def::Variant(def_id))
371371
}
372372
Node::StructCtor(variant) => {
373-
let def_id = self.local_def_id(variant.id());
373+
let def_id = self.local_def_id_from_hir_id(variant.hir_id());
374374
Some(Def::StructCtor(def_id, def::CtorKind::from_hir(variant)))
375375
}
376376
Node::AnonConst(_) |

‎src/librustc/hir/mod.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,9 +2156,9 @@ impl StructField {
21562156
/// Id of the whole struct lives in `Item`.
21572157
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
21582158
pub enum VariantData {
2159-
Struct(HirVec<StructField>, NodeId, HirId),
2160-
Tuple(HirVec<StructField>, NodeId, HirId),
2161-
Unit(NodeId, HirId),
2159+
Struct(HirVec<StructField>, HirId),
2160+
Tuple(HirVec<StructField>, HirId),
2161+
Unit(HirId),
21622162
}
21632163

21642164
impl VariantData {
@@ -2168,18 +2168,11 @@ impl VariantData {
21682168
_ => &[],
21692169
}
21702170
}
2171-
pub fn id(&self) -> NodeId {
2172-
match *self {
2173-
VariantData::Struct(_, id, ..)
2174-
| VariantData::Tuple(_, id, ..)
2175-
| VariantData::Unit(id, ..) => id,
2176-
}
2177-
}
21782171
pub fn hir_id(&self) -> HirId {
21792172
match *self {
2180-
VariantData::Struct(_, _, hir_id)
2181-
| VariantData::Tuple(_, _, hir_id)
2182-
| VariantData::Unit(_, hir_id) => hir_id,
2173+
VariantData::Struct(_, hir_id)
2174+
| VariantData::Tuple(_, hir_id)
2175+
| VariantData::Unit(hir_id) => hir_id,
21832176
}
21842177
}
21852178
pub fn is_struct(&self) -> bool {

‎src/librustc/ich/impls_hir.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -842,9 +842,9 @@ impl_stable_hash_for!(struct hir::StructField {
842842
});
843843

844844
impl_stable_hash_for!(enum hir::VariantData {
845-
Struct(fields, id, hir_id),
846-
Tuple(fields, id, hir_id),
847-
Unit(id, hir_id)
845+
Struct(fields, hir_id),
846+
Tuple(fields, hir_id),
847+
Unit(hir_id)
848848
});
849849

850850
impl<'a> HashStable<StableHashingContext<'a>> for hir::Item {

‎src/librustc_metadata/encoder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
10691069
// for methods, write all the stuff get_trait_method
10701070
// needs to know
10711071
let struct_ctor = if !struct_def.is_struct() {
1072-
Some(tcx.hir().local_def_id(struct_def.id()).index)
1072+
Some(tcx.hir().local_def_id_from_hir_id(struct_def.hir_id()).index)
10731073
} else {
10741074
None
10751075
};
@@ -1772,7 +1772,7 @@ impl<'a, 'b, 'tcx> IndexBuilder<'a, 'b, 'tcx> {
17721772

17731773
// If the struct has a constructor, encode it.
17741774
if !struct_def.is_struct() {
1775-
let ctor_def_id = self.tcx.hir().local_def_id(struct_def.id());
1775+
let ctor_def_id = self.tcx.hir().local_def_id_from_hir_id(struct_def.hir_id());
17761776
self.record(ctor_def_id,
17771777
IsolatedEncoder::encode_struct_ctor,
17781778
(def_id, ctor_def_id));

‎src/librustc_mir/build/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ fn create_constructor_shim<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
229229
-> Mir<'tcx>
230230
{
231231
let span = tcx.hir().span(ctor_id);
232-
if let hir::VariantData::Tuple(ref fields, ctor_id, _) = *v {
232+
if let hir::VariantData::Tuple(ref fields, ctor_id) = *v {
233233
tcx.infer_ctxt().enter(|infcx| {
234234
let mut mir = shim::build_adt_ctor(&infcx, ctor_id, fields, span);
235235

@@ -245,7 +245,7 @@ fn create_constructor_shim<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
245245
};
246246

247247
mir_util::dump_mir(tcx, None, "mir_map", &0,
248-
MirSource::item(tcx.hir().local_def_id(ctor_id)),
248+
MirSource::item(tcx.hir().local_def_id_from_hir_id(ctor_id)),
249249
&mir, |_, _| Ok(()) );
250250

251251
mir

‎src/librustc_mir/shim.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use rustc::ty::query::Providers;
1010
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
1111

1212
use rustc_target::spec::abi::Abi;
13-
use syntax::ast;
1413
use syntax_pos::Span;
1514

1615
use std::fmt;
@@ -855,14 +854,14 @@ fn build_call_shim<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
855854
}
856855

857856
pub fn build_adt_ctor<'a, 'gcx, 'tcx>(infcx: &infer::InferCtxt<'a, 'gcx, 'tcx>,
858-
ctor_id: ast::NodeId,
857+
ctor_id: hir::HirId,
859858
fields: &[hir::StructField],
860859
span: Span)
861860
-> Mir<'tcx>
862861
{
863862
let tcx = infcx.tcx;
864863
let gcx = tcx.global_tcx();
865-
let def_id = tcx.hir().local_def_id(ctor_id);
864+
let def_id = tcx.hir().local_def_id_from_hir_id(ctor_id);
866865
let param_env = gcx.param_env(def_id);
867866

868867
// Normalize the sig.

‎src/librustc_mir/transform/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ fn mir_keys<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, krate: CrateNum)
8080
_: &'tcx hir::Generics,
8181
_: hir::HirId,
8282
_: Span) {
83-
if let hir::VariantData::Tuple(_, node_id, _) = *v {
84-
self.set.insert(self.tcx.hir().local_def_id(node_id));
83+
if let hir::VariantData::Tuple(_, hir_id) = *v {
84+
self.set.insert(self.tcx.hir().local_def_id_from_hir_id(hir_id));
8585
}
8686
intravisit::walk_struct_def(self, v)
8787
}

‎src/librustc_typeck/collect.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ fn convert_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, item_id: hir::HirId) {
454454
}
455455

456456
if !struct_def.is_struct() {
457-
convert_variant_ctor(tcx, struct_def.id());
457+
convert_variant_ctor(tcx, struct_def.hir_id());
458458
}
459459
}
460460

@@ -510,8 +510,8 @@ fn convert_impl_item<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, impl_item_id: hir::H
510510
}
511511
}
512512

513-
fn convert_variant_ctor<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ctor_id: ast::NodeId) {
514-
let def_id = tcx.hir().local_def_id(ctor_id);
513+
fn convert_variant_ctor<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ctor_id: hir::HirId) {
514+
let def_id = tcx.hir().local_def_id_from_hir_id(ctor_id);
515515
tcx.generics_of(def_id);
516516
tcx.type_of(def_id);
517517
tcx.predicates_of(def_id);
@@ -563,7 +563,7 @@ fn convert_enum_variant_types<'a, 'tcx>(
563563

564564
// Convert the ctor, if any. This also registers the variant as
565565
// an item.
566-
convert_variant_ctor(tcx, variant.node.data.id());
566+
convert_variant_ctor(tcx, variant.node.data.hir_id());
567567
}
568568
}
569569

@@ -634,7 +634,7 @@ fn adt_def<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> &'tcx ty::Ad
634634
def.variants
635635
.iter()
636636
.map(|v| {
637-
let did = tcx.hir().local_def_id(v.node.data.id());
637+
let did = tcx.hir().local_def_id_from_hir_id(v.node.data.hir_id());
638638
let discr = if let Some(ref e) = v.node.disr_expr {
639639
distance_from_explicit = 0;
640640
ty::VariantDiscr::Explicit(tcx.hir().local_def_id_from_hir_id(e.hir_id))
@@ -652,7 +652,7 @@ fn adt_def<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> &'tcx ty::Ad
652652
ItemKind::Struct(ref def, _) => {
653653
// Use separate constructor id for unit/tuple structs and reuse did for braced structs.
654654
let ctor_id = if !def.is_struct() {
655-
Some(tcx.hir().local_def_id(def.id()))
655+
Some(tcx.hir().local_def_id_from_hir_id(def.hir_id()))
656656
} else {
657657
None
658658
};

‎src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3088,7 +3088,7 @@ impl Clean<Item> for doctree::Variant {
30883088
visibility: None,
30893089
stability: self.stab.clean(cx),
30903090
deprecation: self.depr.clean(cx),
3091-
def_id: cx.tcx.hir().local_def_id(self.def.id()),
3091+
def_id: cx.tcx.hir().local_def_id_from_hir_id(self.def.hir_id()),
30923092
inner: VariantItem(Variant {
30933093
kind: self.def.clean(cx),
30943094
}),

0 commit comments

Comments
 (0)