use "UNUSED_LIFETIMES" instead

Signed-off-by: Zhi Qi <qizhi@pingcap.com>

Author: LittleFall

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

@@ -969,7 +969,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                                 }
                                 this.insert_lifetime(lt, ResolvedArg::StaticLifetime);
                                 this.tcx.struct_span_lint_hir(
-                                    lint::builtin::NAMED_STATIC_LIFETIMES,
+                                    lint::builtin::UNUSED_LIFETIMES,
                                     lifetime.hir_id,
                                     lifetime.ident.span,
                                     format!(
@@ -981,7 +981,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                                             "you can use the `'static` lifetime directly, in place of `{}`",
                                             lifetime.ident,
                                         );
-                                        lint.note(help)
+                                        lint.help(help)
                                     },
                                 );
                             }

compiler/rustc_lint_defs/src/builtin.rs

@@ -1618,40 +1618,6 @@ declare_lint! {
     "detects lifetime parameters that are never used"
 }
 
-declare_lint! {
-    /// The `named_static_lifetimes` lint detects lifetime parameters that are
-    /// defined as outliving the static lifetime.
-    ///
-    /// ### Example
-    ///
-    /// ```rust,compile_fail
-    /// #[deny(named_static_lifetimes)]
-    ///
-    /// pub fn foo<'a>(_s: &'a str) where 'a: 'static {}
-    /// ```
-    ///
-    /// {{produces}}
-    ///
-    /// ### Explanation
-    ///
-    /// By definition, the static lifetime (`'static`) outlives every other
-    /// lifetime. If another lifetime `'a` lives at least as long as `'static`,
-    /// then it is identical to `'static`. In that case, there is no need for
-    /// the name `'a`, and it likely only makes the code harder to read.
-    ///
-    /// To fix this, consider using `'static` instead of the named lifetime.
-    /// Here is the result of doing that in the example above:
-    ///
-    /// ```rust
-    /// #[deny(named_static_lifetimes)]
-    ///
-    /// pub fn foo(_s: &'static str) {}
-    /// ```
-    pub NAMED_STATIC_LIFETIMES,
-    Warn,
-    "detects lifetime parameters that are identical to `'static`"
-}
-
 declare_lint! {
     /// The `tyvar_behind_raw_pointer` lint detects raw pointer to an
     /// inference variable.
@@ -3309,7 +3275,6 @@ declare_lint_pass! {
         UNCONDITIONAL_RECURSION,
         SINGLE_USE_LIFETIMES,
         UNUSED_LIFETIMES,
-        NAMED_STATIC_LIFETIMES,
         UNUSED_LABELS,
         TYVAR_BEHIND_RAW_POINTER,
         ELIDED_LIFETIMES_IN_PATHS,