Add new HIR implementations of hidden lifetimes in paths lints

Author: shepmaster

compiler/rustc_lint/messages.ftl

@@ -289,6 +289,12 @@ lint_hidden_glob_reexport = private item shadows public glob re-export
 
 lint_hidden_lifetime_parameters = hidden lifetime parameters in types are deprecated
 
+lint_hidden_lifetime_in_path =
+    paths containing hidden lifetime parameters are deprecated
+
+lint_hidden_lifetime_in_path_suggestion =
+    indicate the anonymous lifetime
+
 lint_hidden_unicode_codepoints = unicode codepoint changing visible direction of text present in {$label}
     .label = this {$label} contains {$count ->
         [one] an invisible

compiler/rustc_lint/src/lib.rs

@@ -247,6 +247,7 @@ late_lint_methods!(
             StaticMutRefs: StaticMutRefs,
             UnqualifiedLocalImports: UnqualifiedLocalImports,
             LifetimeStyle: LifetimeStyle,
+            HiddenLifetimesInTypePaths: HiddenLifetimesInTypePaths::default(),
         ]
     ]
 );

compiler/rustc_lint/src/lifetime_style.rs

@@ -1,7 +1,10 @@
+use std::slice;
+
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_hir::intravisit::{self, Visitor};
 use rustc_hir::{self as hir};
-use rustc_session::{declare_lint, declare_lint_pass};
+use rustc_session::lint::Lint;
+use rustc_session::{declare_lint, declare_lint_pass, impl_lint_pass};
 use rustc_span::Span;
 use tracing::instrument;
 
@@ -60,7 +63,84 @@ declare_lint! {
     "detects when an elided lifetime uses different syntax between arguments and return values"
 }
 
-declare_lint_pass!(LifetimeStyle => [MISMATCHED_ELIDED_LIFETIME_STYLES]);
+declare_lint! {
+    /// The `hidden_lifetimes_in_input_paths2` lint detects the use of
+    /// hidden lifetime parameters in types occurring as a function
+    /// argument.
+    ///
+    /// ### Example
+    ///
+    /// ```rust,compile_fail
+    /// #![deny(hidden_lifetimes_in_input_paths2)]
+    ///
+    /// struct ContainsLifetime<'a>(&'a i32);
+    ///
+    /// fn foo(x: &ContainsLifetime) {}
+    /// ```
+    ///
+    /// {{produces}}
+    ///
+    /// ### Explanation
+    ///
+    /// Hidden lifetime parameters can make it difficult to see at a
+    /// glance that borrowing is occurring.
+    ///
+    /// This lint ensures that lifetime parameters are always
+    /// explicitly stated, even if it is the `'_` [placeholder
+    /// lifetime].
+    ///
+    /// This lint is "allow" by default as function arguments by
+    /// themselves do not usually cause much confusion.
+    ///
+    /// [placeholder lifetime]: https://doc.rust-lang.org/reference/lifetime-elision.html#lifetime-elision-in-functions
+    pub HIDDEN_LIFETIMES_IN_INPUT_PATHS2,
+    Allow,
+    "hidden lifetime parameters in types in function arguments may be confusing"
+}
+
+declare_lint! {
+    /// The `hidden_lifetimes_in_output_paths2` lint detects the use
+    /// of hidden lifetime parameters in types occurring as a function
+    /// return value.
+    ///
+    /// ### Example
+    ///
+    /// ```rust,compile_fail
+    /// #![deny(hidden_lifetimes_in_input_paths2)]
+    ///
+    /// struct ContainsLifetime<'a>(&'a i32);
+    ///
+    /// fn foo(x: &i32) -> ContainsLifetime {
+    ///     ContainsLifetime(x)
+    /// }
+    /// ```
+    ///
+    /// {{produces}}
+    ///
+    /// ### Explanation
+    ///
+    /// Hidden lifetime parameters can make it difficult to see at a
+    /// glance that borrowing is occurring. This is especially true
+    /// when a type is used as a function's return value: lifetime
+    /// elision will link the return value's lifetime to an argument's
+    /// lifetime, but no syntax in the function signature indicates
+    /// that.
+    ///
+    /// This lint ensures that lifetime parameters are always
+    /// explicitly stated, even if it is the `'_` [placeholder
+    /// lifetime].
+    ///
+    /// [placeholder lifetime]: https://doc.rust-lang.org/reference/lifetime-elision.html#lifetime-elision-in-functions
+    pub HIDDEN_LIFETIMES_IN_OUTPUT_PATHS2,
+    Allow,
+    "hidden lifetime parameters in types in function return values are deprecated"
+}
+
+declare_lint_pass!(LifetimeStyle => [
+    MISMATCHED_ELIDED_LIFETIME_STYLES,
+    HIDDEN_LIFETIMES_IN_INPUT_PATHS2,
+    HIDDEN_LIFETIMES_IN_OUTPUT_PATHS2,
+]);
 
 impl<'tcx> LateLintPass<'tcx> for LifetimeStyle {
     #[instrument(skip_all)]
@@ -85,6 +165,8 @@ impl<'tcx> LateLintPass<'tcx> for LifetimeStyle {
         }
 
         report_mismatches(cx, &input_map, &output_map);
+        report_hidden_in_paths(cx, &input_map, HIDDEN_LIFETIMES_IN_INPUT_PATHS2);
+        report_hidden_in_paths(cx, &output_map, HIDDEN_LIFETIMES_IN_OUTPUT_PATHS2);
     }
 }
 
@@ -231,6 +313,47 @@ fn build_mismatch_suggestion(
     MismatchedElidedLifetimeStylesSuggestion::Named { lifetime_name, suggestions, tool_only: false }
 }
 
+fn report_hidden_in_paths<'tcx>(
+    cx: &LateContext<'tcx>,
+    info_map: &LifetimeInfoMap<'tcx>,
+    lint: &'static Lint,
+) {
+    let relevant_lifetimes = info_map
+        .iter()
+        .filter(|&(&&res, _)| reportable_lifetime_resolution(res))
+        .flat_map(|(_, info)| info)
+        .filter(|info| info.source == LifetimeSource::Path && info.style == SyntaxStyle::Hidden);
+
+    let mut reporting_spans = Vec::new();
+    let mut suggestions = Vec::new();
+
+    for info in relevant_lifetimes {
+        reporting_spans.push(info.reporting_span());
+        suggestions.push(info.suggestion("'_"));
+    }
+
+    if reporting_spans.is_empty() {
+        return;
+    }
+
+    cx.emit_span_lint(
+        lint,
+        reporting_spans,
+        lints::HiddenLifetimeInPath {
+            suggestions: lints::HiddenLifetimeInPathSuggestion { suggestions },
+        },
+    );
+}
+
+/// We don't care about errors, nor do we care about the lifetime
+/// inside of a trait object.
+fn reportable_lifetime_resolution(res: hir::LifetimeName) -> bool {
+    matches!(
+        res,
+        hir::LifetimeName::Param(..) | hir::LifetimeName::Infer | hir::LifetimeName::Static
+    )
+}
+
 #[derive(Debug, Copy, Clone, PartialEq)]
 enum LifetimeSource {
     Reference,
@@ -326,3 +449,114 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeInfoCollector<'a, 'tcx> {
         self.is_ref = old_is_ref;
     }
 }
+
+declare_lint! {
+    /// The `hidden_lifetimes_in_type_paths2` lint detects the use of
+    /// hidden lifetime parameters in types not part of a function's
+    /// arguments or return values.
+    ///
+    /// ### Example
+    ///
+    /// ```rust,compile_fail
+    /// #![deny(hidden_lifetimes_in_input_paths2)]
+    ///
+    /// struct ContainsLifetime<'a>(&'a i32);
+    ///
+    /// static FOO: ContainsLifetime = ContainsLifetime(&42);
+    /// ```
+    ///
+    /// {{produces}}
+    ///
+    /// ### Explanation
+    ///
+    /// Hidden lifetime parameters can make it difficult to see at a
+    /// glance that borrowing is occurring.
+    ///
+    /// This lint ensures that lifetime parameters are always
+    /// explicitly stated, even if it is the `'_` [placeholder
+    /// lifetime].
+    ///
+    /// [placeholder lifetime]: https://doc.rust-lang.org/reference/lifetime-elision.html#lifetime-elision-in-functions
+    pub HIDDEN_LIFETIMES_IN_TYPE_PATHS2,
+    Allow,
+    "hidden lifetime parameters in types outside function signatures are discouraged"
+}
+
+#[derive(Default)]
+pub(crate) struct HiddenLifetimesInTypePaths {
+    inside_fn_signature: bool,
+}
+
+impl_lint_pass!(HiddenLifetimesInTypePaths => [HIDDEN_LIFETIMES_IN_TYPE_PATHS2]);
+
+impl<'tcx> LateLintPass<'tcx> for HiddenLifetimesInTypePaths {
+    #[instrument(skip(self, cx))]
+    fn check_ty(&mut self, cx: &LateContext<'tcx>, ty: &'tcx hir::Ty<'tcx, hir::AmbigArg>) {
+        if self.inside_fn_signature {
+            return;
+        }
+
+        let hir::TyKind::Path(path) = ty.kind else { return };
+
+        let path_segments = match path {
+            hir::QPath::Resolved(_ty, path) => path.segments,
+
+            hir::QPath::TypeRelative(_ty, path_segment) => slice::from_ref(path_segment),
+
+            hir::QPath::LangItem(..) => &[],
+        };
+
+        let mut suggestions = Vec::new();
+
+        for path_segment in path_segments {
+            // Do not lint about usages like `ContainsLifetime::method`.
+            if path_segment.infer_args {
+                continue;
+            }
+
+            for arg in path_segment.args().args {
+                if let hir::GenericArg::Lifetime(lifetime) = arg
+                    && lifetime.is_syntactically_hidden()
+                    && reportable_lifetime_resolution(lifetime.res)
+                {
+                    suggestions.push(lifetime.suggestion("'_", false))
+                }
+            }
+        }
+
+        if suggestions.is_empty() {
+            return;
+        }
+
+        cx.emit_span_lint(
+            HIDDEN_LIFETIMES_IN_TYPE_PATHS2,
+            ty.span,
+            lints::HiddenLifetimeInPath {
+                suggestions: lints::HiddenLifetimeInPathSuggestion { suggestions },
+            },
+        );
+    }
+
+    #[instrument(skip_all)]
+    fn check_fn(
+        &mut self,
+        _: &LateContext<'tcx>,
+        _: hir::intravisit::FnKind<'tcx>,
+        _: &'tcx hir::FnDecl<'tcx>,
+        _: &'tcx hir::Body<'tcx>,
+        _: rustc_span::Span,
+        _: rustc_span::def_id::LocalDefId,
+    ) {
+        // We make the assumption that we will visit the function
+        // declaration first, before visiting the body.
+        self.inside_fn_signature = true;
+    }
+
+    // This may be a function's body, which would indicate that we are
+    // no longer in the signature. Even if it's not, a body cannot
+    // occur inside a function signature.
+    #[instrument(skip_all)]
+    fn check_body(&mut self, _: &LateContext<'tcx>, _: &hir::Body<'tcx>) {
+        self.inside_fn_signature = false;
+    }
+}

compiler/rustc_lint/src/lints.rs

@@ -3206,3 +3206,28 @@ impl Subdiagnostic for MismatchedElidedLifetimeStylesSuggestion {
         }
     }
 }
+
+#[derive(LintDiagnostic)]
+#[diag(lint_hidden_lifetime_in_path)]
+pub(crate) struct HiddenLifetimeInPath {
+    #[subdiagnostic]
+    pub suggestions: HiddenLifetimeInPathSuggestion,
+}
+
+pub(crate) struct HiddenLifetimeInPathSuggestion {
+    pub suggestions: Vec<(Span, String)>,
+}
+
+impl Subdiagnostic for HiddenLifetimeInPathSuggestion {
+    fn add_to_diag_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
+        self,
+        diag: &mut Diag<'_, G>,
+        _f: &F,
+    ) {
+        diag.multipart_suggestion_verbose(
+            fluent::lint_hidden_lifetime_in_path_suggestion,
+            self.suggestions,
+            Applicability::MachineApplicable,
+        );
+    }
+}