Skip to content

Commit 01cef43

Browse files
ZalatharZalathar
committed
Remove the [] prefix from declare_arena! entries
1 parent b0b25c9 commit 01cef43

3 files changed

Lines changed: 67 additions & 67 deletions

File tree

‎compiler/rustc_arena/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ pub macro declare_arena(
621621
// This allows values of non-copy type $ty to be allocated in the arena.
622622
// The field names must be distinct, but have no further significance.
623623
$(
624-
[] $name:ident: $ty:ty,
624+
$name:ident: $ty:ty,
625625
)*
626626
) {
627627
#[derive(Default)]

‎compiler/rustc_hir/src/arena.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
44
rustc_arena::declare_arena! {
55
// HIR types
6-
[] asm_template: rustc_ast::InlineAsmTemplatePiece,
7-
[] attribute: crate::Attribute,
8-
[] owner_info: crate::OwnerInfo<'tcx>,
9-
[] macro_def: rustc_ast::MacroDef,
10-
[] delegation_info: crate::DelegationInfo,
6+
asm_template: rustc_ast::InlineAsmTemplatePiece,
7+
attribute: crate::Attribute,
8+
owner_info: crate::OwnerInfo<'tcx>,
9+
macro_def: rustc_ast::MacroDef,
10+
delegation_info: crate::DelegationInfo,
1111
}

‎compiler/rustc_middle/src/arena.rs‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,130 +11,130 @@ use crate::ty::{Ty, TyCtxt};
1111
// `impl_ref_decodable_into_arena!`.
1212

1313
rustc_arena::declare_arena! {
14-
[] layout: rustc_abi::LayoutData<rustc_abi::FieldIdx, rustc_abi::VariantIdx>,
15-
[] proxy_coroutine_layout: rustc_middle::mir::CoroutineLayout<'tcx>,
16-
[] fn_abi: rustc_target::callconv::FnAbi<'tcx, Ty<'tcx>>,
17-
[] adt_def: rustc_middle::ty::AdtDefData,
18-
[] steal_thir: rustc_data_structures::steal::Steal<rustc_middle::thir::Thir<'tcx>>,
19-
[] steal_mir: rustc_data_structures::steal::Steal<rustc_middle::mir::Body<'tcx>>,
20-
[] mir: rustc_middle::mir::Body<'tcx>,
21-
[] steal_promoted:
14+
layout: rustc_abi::LayoutData<rustc_abi::FieldIdx, rustc_abi::VariantIdx>,
15+
proxy_coroutine_layout: rustc_middle::mir::CoroutineLayout<'tcx>,
16+
fn_abi: rustc_target::callconv::FnAbi<'tcx, Ty<'tcx>>,
17+
adt_def: rustc_middle::ty::AdtDefData,
18+
steal_thir: rustc_data_structures::steal::Steal<rustc_middle::thir::Thir<'tcx>>,
19+
steal_mir: rustc_data_structures::steal::Steal<rustc_middle::mir::Body<'tcx>>,
20+
mir: rustc_middle::mir::Body<'tcx>,
21+
steal_promoted:
2222
rustc_data_structures::steal::Steal<
2323
rustc_index::IndexVec<
2424
rustc_middle::mir::Promoted,
2525
rustc_middle::mir::Body<'tcx>
2626
>
2727
>,
28-
[] promoted:
28+
promoted:
2929
rustc_index::IndexVec<
3030
rustc_middle::mir::Promoted,
3131
rustc_middle::mir::Body<'tcx>
3232
>,
33-
[] typeck_results: rustc_middle::ty::TypeckResults<'tcx>,
34-
[] borrowck_result:
33+
typeck_results: rustc_middle::ty::TypeckResults<'tcx>,
34+
borrowck_result:
3535
rustc_data_structures::fx::FxIndexMap<
3636
rustc_hir::def_id::LocalDefId,
3737
rustc_middle::ty::DefinitionSiteHiddenType<'tcx>,
3838
>,
39-
[] resolver: rustc_data_structures::steal::Steal<rustc_middle::ty::ResolverAstLowering<'tcx>>,
40-
[] index_ast:
39+
resolver: rustc_data_structures::steal::Steal<rustc_middle::ty::ResolverAstLowering<'tcx>>,
40+
index_ast:
4141
rustc_index::IndexVec<
4242
rustc_span::def_id::LocalDefId,
4343
rustc_data_structures::steal::Steal<(
4444
std::sync::Arc<rustc_middle::ty::ResolverAstLowering<'tcx>>,
4545
rustc_ast::AstOwner
4646
)>
4747
>,
48-
[] crate_alone: rustc_data_structures::steal::Steal<rustc_ast::Crate>,
49-
[] crate_for_resolver: rustc_data_structures::steal::Steal<(rustc_ast::Crate, rustc_ast::AttrVec)>,
50-
[] resolutions: rustc_middle::ty::ResolverGlobalCtxt,
51-
[] const_allocs: rustc_middle::mir::interpret::Allocation,
52-
[] region_scope_tree: rustc_middle::middle::region::ScopeTree,
48+
crate_alone: rustc_data_structures::steal::Steal<rustc_ast::Crate>,
49+
crate_for_resolver: rustc_data_structures::steal::Steal<(rustc_ast::Crate, rustc_ast::AttrVec)>,
50+
resolutions: rustc_middle::ty::ResolverGlobalCtxt,
51+
const_allocs: rustc_middle::mir::interpret::Allocation,
52+
region_scope_tree: rustc_middle::middle::region::ScopeTree,
5353
// Required for the incremental on-disk cache
54-
[] mir_keys: rustc_hir::def_id::DefIdSet,
55-
[] dropck_outlives:
54+
mir_keys: rustc_hir::def_id::DefIdSet,
55+
dropck_outlives:
5656
rustc_middle::infer::canonical::Canonical<'tcx,
5757
rustc_middle::infer::canonical::QueryResponse<'tcx,
5858
rustc_middle::traits::query::DropckOutlivesResult<'tcx>
5959
>
6060
>,
61-
[] normalize_canonicalized_projection:
61+
normalize_canonicalized_projection:
6262
rustc_middle::infer::canonical::Canonical<'tcx,
6363
rustc_middle::infer::canonical::QueryResponse<'tcx,
6464
rustc_middle::traits::query::NormalizationResult<'tcx>
6565
>
6666
>,
67-
[] implied_outlives_bounds:
67+
implied_outlives_bounds:
6868
rustc_middle::infer::canonical::Canonical<'tcx,
6969
rustc_middle::infer::canonical::QueryResponse<'tcx,
7070
Vec<rustc_middle::traits::query::OutlivesBound<'tcx>>
7171
>
7272
>,
73-
[] dtorck_constraint: rustc_middle::traits::query::DropckConstraint<'tcx>,
74-
[] candidate_step: rustc_middle::traits::query::CandidateStep<'tcx>,
75-
[] autoderef_bad_ty: rustc_middle::traits::query::MethodAutoderefBadTy<'tcx>,
76-
[] query_region_constraints: rustc_middle::infer::canonical::QueryRegionConstraints<'tcx>,
77-
[] type_op_subtype:
73+
dtorck_constraint: rustc_middle::traits::query::DropckConstraint<'tcx>,
74+
candidate_step: rustc_middle::traits::query::CandidateStep<'tcx>,
75+
autoderef_bad_ty: rustc_middle::traits::query::MethodAutoderefBadTy<'tcx>,
76+
query_region_constraints: rustc_middle::infer::canonical::QueryRegionConstraints<'tcx>,
77+
type_op_subtype:
7878
rustc_middle::infer::canonical::Canonical<'tcx,
7979
rustc_middle::infer::canonical::QueryResponse<'tcx, ()>
8080
>,
81-
[] type_op_normalize_poly_fn_sig:
81+
type_op_normalize_poly_fn_sig:
8282
rustc_middle::infer::canonical::Canonical<'tcx,
8383
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::PolyFnSig<'tcx>>
8484
>,
85-
[] type_op_normalize_fn_sig:
85+
type_op_normalize_fn_sig:
8686
rustc_middle::infer::canonical::Canonical<'tcx,
8787
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::FnSig<'tcx>>
8888
>,
89-
[] type_op_normalize_clause:
89+
type_op_normalize_clause:
9090
rustc_middle::infer::canonical::Canonical<'tcx,
9191
rustc_middle::infer::canonical::QueryResponse<'tcx, rustc_middle::ty::Clause<'tcx>>
9292
>,
93-
[] type_op_normalize_ty:
93+
type_op_normalize_ty:
9494
rustc_middle::infer::canonical::Canonical<'tcx,
9595
rustc_middle::infer::canonical::QueryResponse<'tcx, Ty<'tcx>>
9696
>,
97-
[] inspect_probe: rustc_middle::traits::solve::inspect::Probe<TyCtxt<'tcx>>,
98-
[] effective_visibilities: rustc_middle::middle::privacy::EffectiveVisibilities,
99-
[] upvars_mentioned: rustc_data_structures::fx::FxIndexMap<rustc_hir::HirId, rustc_hir::Upvar>,
100-
[] dyn_compatibility_violations: rustc_middle::traits::DynCompatibilityViolation,
101-
[] codegen_unit: rustc_middle::mono::CodegenUnit<'tcx>,
102-
[] attribute: rustc_hir::Attribute,
103-
[] name_set: rustc_data_structures::unord::UnordSet<rustc_span::Symbol>,
104-
[] autodiff_item: rustc_hir::attrs::AutoDiffItem,
105-
[] ordered_name_set: rustc_data_structures::fx::FxIndexSet<rustc_span::Symbol>,
106-
[] stable_order_of_exportable_impls:
97+
inspect_probe: rustc_middle::traits::solve::inspect::Probe<TyCtxt<'tcx>>,
98+
effective_visibilities: rustc_middle::middle::privacy::EffectiveVisibilities,
99+
upvars_mentioned: rustc_data_structures::fx::FxIndexMap<rustc_hir::HirId, rustc_hir::Upvar>,
100+
dyn_compatibility_violations: rustc_middle::traits::DynCompatibilityViolation,
101+
codegen_unit: rustc_middle::mono::CodegenUnit<'tcx>,
102+
attribute: rustc_hir::Attribute,
103+
name_set: rustc_data_structures::unord::UnordSet<rustc_span::Symbol>,
104+
autodiff_item: rustc_hir::attrs::AutoDiffItem,
105+
ordered_name_set: rustc_data_structures::fx::FxIndexSet<rustc_span::Symbol>,
106+
stable_order_of_exportable_impls:
107107
rustc_data_structures::fx::FxIndexMap<rustc_hir::def_id::DefId, usize>,
108108

109109
// Note that this deliberately duplicates items in the `rustc_hir::arena`,
110110
// since we need to allocate this type on both the `rustc_hir` arena
111111
// (during lowering) and the `rustc_middle` arena (for decoding MIR)
112-
[] asm_template: rustc_ast::InlineAsmTemplatePiece,
113-
[] used_trait_imports: rustc_data_structures::unord::UnordSet<rustc_hir::def_id::LocalDefId>,
114-
[] is_late_bound_map: rustc_data_structures::fx::FxIndexSet<rustc_hir::ItemLocalId>,
115-
[] impl_source: rustc_middle::traits::ImplSource<'tcx, ()>,
112+
asm_template: rustc_ast::InlineAsmTemplatePiece,
113+
used_trait_imports: rustc_data_structures::unord::UnordSet<rustc_hir::def_id::LocalDefId>,
114+
is_late_bound_map: rustc_data_structures::fx::FxIndexSet<rustc_hir::ItemLocalId>,
115+
impl_source: rustc_middle::traits::ImplSource<'tcx, ()>,
116116

117-
[] dep_kind_vtable: rustc_middle::dep_graph::DepKindVTable<'tcx>,
117+
dep_kind_vtable: rustc_middle::dep_graph::DepKindVTable<'tcx>,
118118

119-
[] trait_impl_trait_tys:
119+
trait_impl_trait_tys:
120120
rustc_data_structures::unord::UnordMap<
121121
rustc_hir::def_id::DefId,
122122
rustc_middle::ty::EarlyBinder<'tcx, Ty<'tcx>>
123123
>,
124-
[] external_constraints: rustc_middle::traits::solve::ExternalConstraintsData<TyCtxt<'tcx>>,
125-
[] doc_link_resolutions: rustc_hir::def::DocLinkResMap,
126-
[] stripped_cfg_items: rustc_hir::attrs::StrippedCfgItem,
127-
[] mod_child: rustc_middle::metadata::ModChild,
128-
[] features: rustc_feature::Features,
129-
[] specialization_graph: rustc_middle::traits::specialization_graph::Graph,
130-
[] crate_inherent_impls: rustc_middle::ty::CrateInherentImpls,
131-
[] hir_owner_nodes: rustc_hir::OwnerNodes<'tcx>,
132-
[] token_stream: rustc_ast::tokenstream::TokenStream,
133-
[] maybe_owner: rustc_middle::hir::ProjectedMaybeOwner<'tcx>,
134-
[] owner_info: rustc_middle::hir::ProjectedOwnerInfo<'tcx>,
135-
[] parenting: rustc_hir::def_id::LocalDefIdMap<rustc_hir::ItemLocalId>,
136-
[] trait_candidates: rustc_hir::ItemLocalMap<&'tcx [rustc_hir::TraitCandidate<'tcx>]>,
137-
[] delayed_lints: rustc_data_structures::steal::Steal<rustc_hir::lints::DelayedLints>,
124+
external_constraints: rustc_middle::traits::solve::ExternalConstraintsData<TyCtxt<'tcx>>,
125+
doc_link_resolutions: rustc_hir::def::DocLinkResMap,
126+
stripped_cfg_items: rustc_hir::attrs::StrippedCfgItem,
127+
mod_child: rustc_middle::metadata::ModChild,
128+
features: rustc_feature::Features,
129+
specialization_graph: rustc_middle::traits::specialization_graph::Graph,
130+
crate_inherent_impls: rustc_middle::ty::CrateInherentImpls,
131+
hir_owner_nodes: rustc_hir::OwnerNodes<'tcx>,
132+
token_stream: rustc_ast::tokenstream::TokenStream,
133+
maybe_owner: rustc_middle::hir::ProjectedMaybeOwner<'tcx>,
134+
owner_info: rustc_middle::hir::ProjectedOwnerInfo<'tcx>,
135+
parenting: rustc_hir::def_id::LocalDefIdMap<rustc_hir::ItemLocalId>,
136+
trait_candidates: rustc_hir::ItemLocalMap<&'tcx [rustc_hir::TraitCandidate<'tcx>]>,
137+
delayed_lints: rustc_data_structures::steal::Steal<rustc_hir::lints::DelayedLints>,
138138
}
139139

140140
#[inline]

0 commit comments

Comments
 (0)