Rollup merge of #68288 - RalfJung:fmt, r=oli-obk

[rust.git] / src / librustc / arena.rs

diff --git a/src/librustc/arena.rs b/src/librustc/arena.rs
index f604a66aebc01b77811f7ac2e2b43d4f5a2275c2..cb3fdff53a3b0ed16a2a245d6e79e3e36b1157cb 100644 (file)
--- a/src/librustc/arena.rs
+++ b/src/librustc/arena.rs
@@ -38,13 +38,13 @@ macro_rules! arena_types {
             [] tables: rustc::ty::TypeckTables<$tcx>,
             [] const_allocs: rustc::mir::interpret::Allocation,
             [] vtable_method: Option<(
-                rustc::hir::def_id::DefId,
+                rustc_hir::def_id::DefId,
                 rustc::ty::subst::SubstsRef<$tcx>
             )>,
-            [few, decode] mir_keys: rustc::util::nodemap::DefIdSet,
+            [few, decode] mir_keys: rustc_hir::def_id::DefIdSet,
             [decode] specialization_graph: rustc::traits::specialization_graph::Graph,
             [] region_scope_tree: rustc::middle::region::ScopeTree,
-            [] item_local_set: rustc::util::nodemap::ItemLocalSet,
+            [] item_local_set: rustc_hir::ItemLocalSet,
             [decode] mir_const_qualif: rustc_index::bit_set::BitSet<rustc::mir::Local>,
             [] trait_impls_of: rustc::ty::trait_def::TraitImpls,
             [] dropck_outlives:
@@ -87,67 +87,75 @@ macro_rules! arena_types {
                 >,
             [few] crate_inherent_impls: rustc::ty::CrateInherentImpls,
             [few] upstream_monomorphizations:
-                rustc::util::nodemap::DefIdMap<
+                rustc_hir::def_id::DefIdMap<
                     rustc_data_structures::fx::FxHashMap<
                         rustc::ty::subst::SubstsRef<'tcx>,
-                        rustc::hir::def_id::CrateNum
+                        rustc_hir::def_id::CrateNum
                     >
                 >,
             [few] diagnostic_items: rustc_data_structures::fx::FxHashMap<
-                syntax::symbol::Symbol,
-                rustc::hir::def_id::DefId,
+                rustc_span::symbol::Symbol,
+                rustc_hir::def_id::DefId,
             >,
             [few] resolve_lifetimes: rustc::middle::resolve_lifetime::ResolveLifetimes,
             [few] lint_levels: rustc::lint::LintLevelMap,
             [few] stability_index: rustc::middle::stability::Index<'tcx>,
             [few] features: rustc_feature::Features,
-            [few] all_traits: Vec<rustc::hir::def_id::DefId>,
+            [few] all_traits: Vec<rustc_hir::def_id::DefId>,
             [few] privacy_access_levels: rustc::middle::privacy::AccessLevels,
             [few] target_features_whitelist: rustc_data_structures::fx::FxHashMap<
                 String,
-                Option<syntax::symbol::Symbol>
+                Option<rustc_span::symbol::Symbol>
             >,
             [few] wasm_import_module_map: rustc_data_structures::fx::FxHashMap<
-                rustc::hir::def_id::DefId,
+                rustc_hir::def_id::DefId,
                 String
             >,
             [few] get_lib_features: rustc::middle::lib_features::LibFeatures,
             [few] defined_lib_features: rustc::middle::lang_items::LanguageItems,
-            [few] visible_parent_map: rustc::util::nodemap::DefIdMap<rustc::hir::def_id::DefId>,
+            [few] visible_parent_map: rustc_hir::def_id::DefIdMap<rustc_hir::def_id::DefId>,
             [few] foreign_module: rustc::middle::cstore::ForeignModule,
             [few] foreign_modules: Vec<rustc::middle::cstore::ForeignModule>,
-            [few] reachable_non_generics: rustc::util::nodemap::DefIdMap<
+            [few] reachable_non_generics: rustc_hir::def_id::DefIdMap<
                 rustc::middle::exported_symbols::SymbolExportLevel
             >,
             [few] crate_variances: rustc::ty::CrateVariancesMap<'tcx>,
             [few] inferred_outlives_crate: rustc::ty::CratePredicatesMap<'tcx>,
-            [] upvars: rustc_data_structures::fx::FxIndexMap<rustc::hir::HirId, rustc::hir::Upvar>,
+            [] upvars: rustc_data_structures::fx::FxIndexMap<rustc_hir::HirId, rustc_hir::Upvar>,
 
             // HIR types
             [few] hir_forest: rustc::hir::map::Forest<$tcx>,
-            [] arm: rustc::hir::Arm<$tcx>,
+            [] arm: rustc_hir::Arm<$tcx>,
             [] attribute: syntax::ast::Attribute,
-            [] block: rustc::hir::Block<$tcx>,
-            [few] global_asm: rustc::hir::GlobalAsm,
-            [] expr: rustc::hir::Expr<$tcx>,
-            [] field: rustc::hir::Field<$tcx>,
-            [] field_pat: rustc::hir::FieldPat<$tcx>,
-            [] fn_decl: rustc::hir::FnDecl,
-            [] foreign_item: rustc::hir::ForeignItem<$tcx>,
-            [] impl_item_ref: rustc::hir::ImplItemRef,
-            [] inline_asm: rustc::hir::InlineAsm<$tcx>,
-            [] local: rustc::hir::Local<$tcx>,
-            [few] macro_def: rustc::hir::MacroDef<$tcx>,
-            [] param: rustc::hir::Param<$tcx>,
-            [] pat: rustc::hir::Pat<$tcx>,
-            [] path: rustc::hir::Path,
-            [] path_segment: rustc::hir::PathSegment,
-            [] qpath: rustc::hir::QPath,
-            [] stmt: rustc::hir::Stmt<$tcx>,
-            [] struct_field: rustc::hir::StructField<$tcx>,
-            [] trait_item_ref: rustc::hir::TraitItemRef,
-            [] ty: rustc::hir::Ty,
-            [] variant: rustc::hir::Variant<$tcx>,
+            [] block: rustc_hir::Block<$tcx>,
+            [] bare_fn_ty: rustc_hir::BareFnTy<$tcx>,
+            [few] global_asm: rustc_hir::GlobalAsm,
+            [] generic_arg: rustc_hir::GenericArg<$tcx>,
+            [] generic_args: rustc_hir::GenericArgs<$tcx>,
+            [] generic_bound: rustc_hir::GenericBound<$tcx>,
+            [] generic_param: rustc_hir::GenericParam<$tcx>,
+            [] expr: rustc_hir::Expr<$tcx>,
+            [] field: rustc_hir::Field<$tcx>,
+            [] field_pat: rustc_hir::FieldPat<$tcx>,
+            [] fn_decl: rustc_hir::FnDecl<$tcx>,
+            [] foreign_item: rustc_hir::ForeignItem<$tcx>,
+            [] impl_item_ref: rustc_hir::ImplItemRef<$tcx>,
+            [] inline_asm: rustc_hir::InlineAsm<$tcx>,
+            [] local: rustc_hir::Local<$tcx>,
+            [few] macro_def: rustc_hir::MacroDef<$tcx>,
+            [] param: rustc_hir::Param<$tcx>,
+            [] pat: rustc_hir::Pat<$tcx>,
+            [] path: rustc_hir::Path<$tcx>,
+            [] path_segment: rustc_hir::PathSegment<$tcx>,
+            [] poly_trait_ref: rustc_hir::PolyTraitRef<$tcx>,
+            [] qpath: rustc_hir::QPath<$tcx>,
+            [] stmt: rustc_hir::Stmt<$tcx>,
+            [] struct_field: rustc_hir::StructField<$tcx>,
+            [] trait_item_ref: rustc_hir::TraitItemRef,
+            [] ty: rustc_hir::Ty<$tcx>,
+            [] type_binding: rustc_hir::TypeBinding<$tcx>,
+            [] variant: rustc_hir::Variant<$tcx>,
+            [] where_predicate: rustc_hir::WherePredicate<$tcx>,
         ], $tcx);
     )
 }