remove duplicate _ is a reserved lifetime name

Signed-off-by: xizheyin <[email protected]>

Author: xizheyin

compiler/rustc_resolve/messages.ftl

@@ -135,10 +135,6 @@ resolve_expected_module_found =
     expected module, found {$res} `{$path_str}`
     .label = not a module
 
-resolve_explicit_anonymous_lifetime_report_error =
-    `'_` cannot be used here
-    .label = `'_` is a reserved lifetime name
-
 resolve_explicit_unsafe_traits =
     unsafe traits like `{$ident}` should be implemented explicitly
 

compiler/rustc_resolve/src/errors.rs

@@ -915,14 +915,6 @@ pub(crate) struct ElidedAnonymousLivetimeReportErrorSuggestion {
     pub(crate) hi: Span,
 }
 
-#[derive(Diagnostic)]
-#[diag(resolve_explicit_anonymous_lifetime_report_error, code = E0637)]
-pub(crate) struct ExplicitAnonymousLivetimeReportError {
-    #[primary_span]
-    #[label]
-    pub(crate) span: Span,
-}
-
 #[derive(Diagnostic)]
 #[diag(resolve_implicit_elided_lifetimes_not_allowed_here, code = E0726)]
 pub(crate) struct ImplicitElidedLifetimeNotAllowedHere {

compiler/rustc_resolve/src/late.rs

@@ -1929,9 +1929,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                             });
                         }
                     } else {
-                        self.r.dcx().emit_err(errors::ExplicitAnonymousLivetimeReportError {
-                            span: lifetime.ident.span,
-                        });
+                        self.r.dcx().emit_err(errors::UnderscoreLifetimeIsReserved { span: lifetime.ident.span });
                     };
                     self.record_lifetime_res(lifetime.id, LifetimeRes::Error, elision_candidate);
                     return;
@@ -2905,7 +2903,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                 if param.ident.name == kw::UnderscoreLifetime {
                     self.r
                         .dcx()
-                        .emit_err(errors::UnderscoreLifetimeIsReserved { span: param.ident.span });
+                        .emit_err(errors::UnderscoreLifetimeIsReserved { span: param.ident.span }); 
                     // Record lifetime res, so lowering knows there is something fishy.
                     self.record_lifetime_param(param.id, LifetimeRes::Error);
                     continue;