Fix ICE & bless the remaining tests

Author: GrigorenkoPV

compiler/rustc_resolve/src/late.rs

@@ -702,8 +702,9 @@ struct LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
 
     /// We need some "real" `NodeId` to emit
     /// [`elided_named_lifetimes`](lint::builtin::ELIDED_NAMED_LIFETIMES).
-    /// See comments in [`MissingLifetime::id_if_not_fake_or`].
+    /// See comments in [`MissingLifetime::id_if_exists_in_source_or`].
     crate_node_id: NodeId,
+
     /// Don't emit [`elided_named_lifetimes`](lint::builtin::ELIDED_NAMED_LIFETIMES)
     /// when we are in a type annotation for a `const` or `static`.
     /// ```rust
@@ -2072,7 +2073,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
                         if self.warn_elided_static {
                             self.r.lint_buffer.buffer_lint(
                                 lint::builtin::ELIDED_NAMED_LIFETIMES,
-                                missing.id_if_not_fake_or(self.crate_node_id),
+                                missing.id_if_exists_in_source_or(self.crate_node_id),
                                 missing.span,
                                 BuiltinLintDiag::ElidedIsStatic { elided },
                             );
@@ -2086,7 +2087,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
                             // but `binder` sounds like a more appropriate place than the crate,
                             // and to convert `param` from `LocalDefId` to `NodeId`,
                             // we would have to do some additional work.
-                            missing.id_if_not_fake_or(binder),
+                            missing.id_if_exists_in_source_or(binder),
                             missing.span,
                             BuiltinLintDiag::ElidedIsParam { elided, param },
                         );

compiler/rustc_resolve/src/late/diagnostics.rs

@@ -117,12 +117,12 @@ impl MissingLifetime {
     /// in a sense that they are temporary and not get preserved down the line,
     /// which means that the lints for those nodes will not get emitted.
     /// To combat this, we can try to use some other `NodeId`s as a fallback option.
-    pub(super) fn id_if_not_fake_or(self, fallback: NodeId) -> NodeId {
+    pub(super) fn id_if_exists_in_source_or(self, fallback: NodeId) -> NodeId {
         match self.kind {
-            MissingLifetimeKind::Underscore
-            | MissingLifetimeKind::Comma
-            | MissingLifetimeKind::Brackets => self.id,
-            MissingLifetimeKind::Ampersand => fallback,
+            MissingLifetimeKind::Underscore => self.id,
+            MissingLifetimeKind::Ampersand
+            | MissingLifetimeKind::Brackets
+            | MissingLifetimeKind::Comma => fallback,
         }
     }
 }

tests/ui/const-generics/type-dependent/issue-71348.full.stderr

@@ -0,0 +1,10 @@
+warning: elided lifetime has a name
+  --> $DIR/issue-71348.rs:18:68
+   |
+LL |     fn ask<'a, const N: &'static str>(&'a self) -> &'a <Self as Get<N>>::Target
+   |            -- lifetime `'a` declared here                          ^ this elided lifetime gets resolved as `'a`
+   |
+   = note: `#[warn(elided_named_lifetimes)]` on by default
+
+warning: 1 warning emitted
+

tests/ui/const-generics/type-dependent/issue-71348.min.stderr

@@ -1,3 +1,11 @@
+warning: elided lifetime has a name
+  --> $DIR/issue-71348.rs:18:68
+   |
+LL |     fn ask<'a, const N: &'static str>(&'a self) -> &'a <Self as Get<N>>::Target
+   |            -- lifetime `'a` declared here                          ^ this elided lifetime gets resolved as `'a`
+   |
+   = note: `#[warn(elided_named_lifetimes)]` on by default
+
 error: `&'static str` is forbidden as the type of a const generic parameter
   --> $DIR/issue-71348.rs:10:24
    |
@@ -30,5 +38,5 @@ help: add `#![feature(unsized_const_params)]` to the crate attributes to enable
 LL + #![feature(unsized_const_params)]
    |
 
-error: aborting due to 2 previous errors
+error: aborting due to 2 previous errors; 1 warning emitted
 

tests/ui/const-generics/type-dependent/issue-71348.rs

@@ -17,6 +17,7 @@ trait Get<'a, const N: &'static str> {
 impl Foo {
     fn ask<'a, const N: &'static str>(&'a self) -> &'a <Self as Get<N>>::Target
     //[min]~^ ERROR `&'static str` is forbidden as the type of a const generic parameter
+    //~^^ WARNING elided lifetime has a name
     where
         Self: Get<'a, N>,
     {

tests/ui/type-alias-impl-trait/missing_lifetime_bound.rs

@@ -2,7 +2,7 @@
 
 type Opaque2<T> = impl Sized;
 type Opaque<'a, T> = Opaque2<T>;
-fn defining<'a, T>(x: &'a i32) -> Opaque<T> { x }
+fn defining<'a, T>(x: &'a i32) -> Opaque<T> { x } //~ WARNING elided lifetime has a name
 //~^ ERROR: hidden type for `Opaque2<T>` captures lifetime that does not appear in bounds
 
 fn main() {}

tests/ui/type-alias-impl-trait/missing_lifetime_bound.stderr

@@ -1,3 +1,13 @@
+warning: elided lifetime has a name
+  --> $DIR/missing_lifetime_bound.rs:5:41
+   |
+LL | fn defining<'a, T>(x: &'a i32) -> Opaque<T> { x }
+   |             --                          ^ this elided lifetime gets resolved as `'a`
+   |             |
+   |             lifetime `'a` declared here
+   |
+   = note: `#[warn(elided_named_lifetimes)]` on by default
+
 error[E0700]: hidden type for `Opaque2<T>` captures lifetime that does not appear in bounds
   --> $DIR/missing_lifetime_bound.rs:5:47
    |
@@ -9,6 +19,6 @@ LL | fn defining<'a, T>(x: &'a i32) -> Opaque<T> { x }
    |             |
    |             hidden type `&'a i32` captures the lifetime `'a` as defined here
 
-error: aborting due to 1 previous error
+error: aborting due to 1 previous error; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0700`.