Preserve the ErrorGuaranteed in LifetimeName::Error

Author: oli-obk

compiler/rustc_ast_lowering/src/lib.rs

@@ -2069,7 +2069,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             }
             LifetimeRes::Infer => hir::LifetimeName::Infer,
             LifetimeRes::Static => hir::LifetimeName::Static,
-            LifetimeRes::Error(_guar) => hir::LifetimeName::Error,
+            LifetimeRes::Error(guar) => hir::LifetimeName::Error(guar),
             res => panic!(
                 "Unexpected lifetime resolution {:?} for {:?} at {:?}",
                 res, ident, ident.span

compiler/rustc_hir/src/hir.rs

@@ -95,7 +95,7 @@ pub enum LifetimeName {
 
     /// Indicates an error during lowering (usually `'_` in wrong place)
     /// that was already reported.
-    Error,
+    Error(ErrorGuaranteed),
 
     /// User wrote an anonymous lifetime, either `'_` or nothing.
     /// The semantics of this lifetime should be inferred by typechecking code.
@@ -114,7 +114,7 @@ impl LifetimeName {
             // -- but this is because, as far as the code in the compiler is
             // concerned -- `Fresh` variants act equivalently to "some fresh name".
             // They correspond to early-bound regions on an impl, in other words.
-            LifetimeName::Error | LifetimeName::Param(..) | LifetimeName::Static => false,
+            LifetimeName::Error(_) | LifetimeName::Param(..) | LifetimeName::Static => false,
         }
     }
 }

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

@@ -566,7 +566,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                 LifetimeName::Param(def_id) => {
                     self.resolve_lifetime_ref(def_id, lt);
                 }
-                LifetimeName::Error => {}
+                LifetimeName::Error(_) => {}
                 LifetimeName::ImplicitObjectLifetimeDefault
                 | LifetimeName::Infer
                 | LifetimeName::Static => {
@@ -678,7 +678,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                         // If the user wrote an explicit name, use that.
                         self.visit_lifetime(lifetime);
                     }
-                    LifetimeName::Error => {}
+                    LifetimeName::Error(_) => {}
                 }
             }
             hir::TyKind::Ref(lifetime_ref, ref mt) => {
@@ -819,7 +819,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                 self.resolve_lifetime_ref(param_def_id, lifetime_ref)
             }
             // If we've already reported an error, just ignore `lifetime_ref`.
-            hir::LifetimeName::Error => {}
+            hir::LifetimeName::Error(_) => {}
             // Those will be resolved by typechecking.
             hir::LifetimeName::ImplicitObjectLifetimeDefault | hir::LifetimeName::Infer => {}
         }