Remove has_late_bound_regions from Generics.

Author: cjgillot

compiler/rustc_hir_analysis/src/astconv/generics.rs

@@ -628,7 +628,15 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             return ExplicitLateBound::No;
         }
 
-        if let Some(span_late) = def.has_late_bound_regions {
+        let has_late_bound_regions = def
+            .params
+            .iter()
+            .find(|param| {
+                matches!(param.kind, ty::GenericParamDefKind::Lifetime { late_bound: true })
+            })
+            .map(|param| tcx.def_span(param.def_id));
+
+        if let Some(span_late) = has_late_bound_regions {
             let msg = "cannot specify lifetime arguments explicitly \
                        if late bound lifetime parameters are present";
             let note = "the late bound lifetime parameter is introduced here";

compiler/rustc_hir_analysis/src/collect/generics_of.rs

@@ -89,7 +89,6 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::Generics {
                         params,
                         param_def_id_to_index,
                         has_self: generics.has_self,
-                        has_late_bound_regions: generics.has_late_bound_regions,
                     };
                 }
 
@@ -371,18 +370,13 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::Generics {
     }
 
     let param_def_id_to_index = params.iter().map(|param| (param.def_id, param.index)).collect();
-    let has_late_bound_regions = params
-        .iter()
-        .find(|param| matches!(param.kind, ty::GenericParamDefKind::Lifetime { late_bound: true }))
-        .map(|param| tcx.def_span(param.def_id));
 
     ty::Generics {
         parent: parent_def_id,
         parent_count,
         params,
         param_def_id_to_index,
         has_self: has_self || parent_has_self,
-        has_late_bound_regions,
     }
 }
 

compiler/rustc_middle/src/ty/generics.rs

@@ -118,7 +118,6 @@ pub struct Generics {
     pub param_def_id_to_index: FxHashMap<DefId, u32>,
 
     pub has_self: bool,
-    pub has_late_bound_regions: Option<Span>,
 }
 
 impl<'tcx> Generics {