Skip to content

Commit 6ba4c2f

Browse files
committed
Remove unused arena kinds in rustc_hir and rustc_middle.
1 parent 290fc68 commit 6ba4c2f

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

compiler/rustc_hir/src/arena.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ macro_rules! arena_types {
55
($macro:path) => (
66
$macro!([
77
// HIR types
8-
[] hir_krate: rustc_hir::Crate<'tcx>,
98
[] asm_template: rustc_ast::InlineAsmTemplatePiece,
109
[] attribute: rustc_ast::Attribute,
1110
[] owner_info: rustc_hir::OwnerInfo<'tcx>,

compiler/rustc_middle/src/arena.rs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,12 @@ macro_rules! arena_types {
2727
rustc_middle::mir::Promoted,
2828
rustc_middle::mir::Body<'tcx>
2929
>,
30-
[decode] closure_debuginfo:
31-
rustc_index::IndexVec<
32-
rustc_target::abi::FieldIdx,
33-
rustc_span::symbol::Symbol,
34-
>,
3530
[decode] typeck_results: rustc_middle::ty::TypeckResults<'tcx>,
36-
[decode] borrowck_result:
37-
rustc_middle::mir::BorrowCheckResult<'tcx>,
31+
[decode] borrowck_result: rustc_middle::mir::BorrowCheckResult<'tcx>,
3832
[] resolver: rustc_data_structures::steal::Steal<(
3933
rustc_middle::ty::ResolverAstLowering,
4034
rustc_data_structures::sync::Lrc<rustc_ast::Crate>,
4135
)>,
42-
[] output_filenames: std::sync::Arc<rustc_session::config::OutputFilenames>,
4336
[] crate_for_resolver: rustc_data_structures::steal::Steal<(rustc_ast::Crate, rustc_ast::AttrVec)>,
4437
[] resolutions: rustc_middle::ty::ResolverGlobalCtxt,
4538
[decode] unsafety_check_result: rustc_middle::mir::UnsafetyCheckResult,
@@ -91,29 +84,23 @@ macro_rules! arena_types {
9184
rustc_middle::infer::canonical::Canonical<'tcx,
9285
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::Ty<'tcx>>
9386
>,
94-
[] all_traits: Vec<rustc_hir::def_id::DefId>,
9587
[] effective_visibilities: rustc_middle::middle::privacy::EffectiveVisibilities,
96-
[] foreign_module: rustc_session::cstore::ForeignModule,
97-
[] foreign_modules: Vec<rustc_session::cstore::ForeignModule>,
9888
[] upvars_mentioned: rustc_data_structures::fx::FxIndexMap<rustc_hir::HirId, rustc_hir::Upvar>,
9989
[] object_safety_violations: rustc_middle::traits::ObjectSafetyViolation,
10090
[] codegen_unit: rustc_middle::mir::mono::CodegenUnit<'tcx>,
10191
[decode] attribute: rustc_ast::Attribute,
10292
[] name_set: rustc_data_structures::unord::UnordSet<rustc_span::symbol::Symbol>,
10393
[] ordered_name_set: rustc_data_structures::fx::FxIndexSet<rustc_span::symbol::Symbol>,
104-
[] hir_id_set: rustc_hir::HirIdSet,
10594

10695
// Interned types
10796
[] tys: rustc_type_ir::WithCachedTypeInfo<rustc_middle::ty::TyKind<'tcx>>,
108-
[] predicates: rustc_type_ir::WithCachedTypeInfo<rustc_middle::ty::PredicateKind<'tcx>>,
10997
[] consts: rustc_middle::ty::ConstData<'tcx>,
11098

11199
// Note that this deliberately duplicates items in the `rustc_hir::arena`,
112100
// since we need to allocate this type on both the `rustc_hir` arena
113101
// (during lowering) and the `librustc_middle` arena (for decoding MIR)
114102
[decode] asm_template: rustc_ast::InlineAsmTemplatePiece,
115103
[decode] used_trait_imports: rustc_data_structures::unord::UnordSet<rustc_hir::def_id::LocalDefId>,
116-
[decode] registered_tools: rustc_middle::ty::RegisteredTools,
117104
[decode] is_late_bound_map: rustc_data_structures::fx::FxIndexSet<rustc_hir::ItemLocalId>,
118105
[decode] impl_source: rustc_middle::traits::ImplSource<'tcx, ()>,
119106

@@ -124,11 +111,9 @@ macro_rules! arena_types {
124111
rustc_hir::def_id::DefId,
125112
rustc_middle::ty::EarlyBinder<rustc_middle::ty::Ty<'tcx>>
126113
>,
127-
[] bit_set_u32: rustc_index::bit_set::BitSet<u32>,
128114
[] external_constraints: rustc_middle::traits::solve::ExternalConstraintsData<'tcx>,
129115
[] predefined_opaques_in_body: rustc_middle::traits::solve::PredefinedOpaquesData<'tcx>,
130116
[decode] doc_link_resolutions: rustc_hir::def::DocLinkResMap,
131-
[] closure_kind_origin: (rustc_span::Span, rustc_middle::hir::place::Place<'tcx>),
132117
[] stripped_cfg_items: rustc_ast::expand::StrippedCfgItem,
133118
[] mod_child: rustc_middle::metadata::ModChild,
134119
[] features: rustc_feature::Features,

0 commit comments

Comments
 (0)