Move lifetime_elision_allowed to per owner tables

Author: oli-obk

compiler/rustc_ast_lowering/src/lib.rs

@@ -1662,7 +1662,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             c_variadic,
             lifetime_elision_allowed: self
                 .resolver
-                .general
+                .item
                 .lifetime_elision_allowed
                 .contains(&fn_node_id),
             implicit_self: decl.inputs.get(0).map_or(hir::ImplicitSelfKind::None, |arg| {

compiler/rustc_middle/src/ty/mod.rs

@@ -193,6 +193,8 @@ pub struct PerOwnerResolverData {
     pub node_id_to_def_id: NodeMap<LocalDefId>,
     /// Resolutions for labels (node IDs of their corresponding blocks or loops).
     pub label_res_map: NodeMap<ast::NodeId>,
+    /// List functions and methods for which lifetime elision was successful.
+    pub lifetime_elision_allowed: FxHashSet<ast::NodeId>,
     /// The id of the owner
     pub id: ast::NodeId,
 }
@@ -204,6 +206,7 @@ impl PerOwnerResolverData {
             label_res_map: Default::default(),
             legacy_const_generic_args: Default::default(),
             id,
+            lifetime_elision_allowed: Default::default(),
         }
     }
 }
@@ -226,8 +229,6 @@ pub struct ResolverAstLowering {
     pub next_node_id: ast::NodeId,
 
     pub trait_map: NodeMap<Vec<hir::TraitCandidate>>,
-    /// List functions and methods for which lifetime elision was successful.
-    pub lifetime_elision_allowed: FxHashSet<ast::NodeId>,
 
     /// Lints that were emitted by the resolver and early lints.
     pub lint_buffer: Steal<LintBuffer>,

compiler/rustc_resolve/src/lib.rs

@@ -1208,8 +1208,6 @@ pub struct Resolver<'ra, 'tcx> {
     /// they are declared in the static array generated by proc_macro_harness.
     proc_macros: Vec<NodeId>,
     confused_type_with_std_module: FxIndexMap<Span, Span>,
-    /// Whether lifetime elision was successful.
-    lifetime_elision_allowed: FxHashSet<NodeId>,
 
     /// Names of items that were stripped out via cfg with their corresponding cfg meta item.
     stripped_cfg_items: Vec<StrippedCfgItem<NodeId>>,
@@ -1586,7 +1584,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             trait_impls: Default::default(),
             proc_macros: Default::default(),
             confused_type_with_std_module: Default::default(),
-            lifetime_elision_allowed: Default::default(),
             stripped_cfg_items: Default::default(),
             effective_visibilities: Default::default(),
             doc_link_resolutions: Default::default(),
@@ -1706,7 +1703,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             extra_lifetime_params_map: self.extra_lifetime_params_map,
             next_node_id: self.next_node_id,
             trait_map: self.trait_map,
-            lifetime_elision_allowed: self.lifetime_elision_allowed,
             lint_buffer: Steal::new(self.lint_buffer),
             delegation_fn_sigs: self.delegation_fn_sigs,
         };

compiler/rustc_resolve/src/macros.rs

@@ -523,10 +523,12 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
                     id: _,
                     legacy_const_generic_args,
                     label_res_map,
+                    lifetime_elision_allowed,
                 } = old;
                 assert!(node_id_to_def_id.is_empty());
                 assert!(legacy_const_generic_args.is_empty());
                 assert!(label_res_map.is_empty());
+                assert!(lifetime_elision_allowed.is_empty());
             }
         } else {
             assert!(self.owners.insert(old.id, old).is_none());