Move more early buffered lints for rustc_resolve to dyn lint diagnostics

fmease · fmease · commit 475c181fc527 · 2025-12-14T14:35:47.000+01:00
diff --git a/compiler/rustc_lint/messages.ftl b/compiler/rustc_lint/messages.ftl
@@ -1,10 +1,6 @@
 lint_abs_path_with_module = absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
     .suggestion = use `crate`
 
-lint_ambiguous_glob_reexport = ambiguous glob re-exports
-    .label_first_reexport = the name `{$name}` in the {$namespace} namespace is first re-exported here
-    .label_duplicate_reexport = but the name `{$name}` in the {$namespace} namespace is also re-exported here
-
 lint_ambiguous_negative_literals = `-` has lower precedence than method calls, which might be unexpected
     .example = e.g. `-4.abs()` equals `-4`; while `(-4).abs()` equals `4`
     .negative_literal = add parentheses around the `-` and the literal to call the method on a negative literal
@@ -16,13 +12,6 @@ lint_ambiguous_wide_pointer_comparisons = ambiguous wide pointer comparison, the
     .cast_suggestion = use untyped pointers to only compare their addresses
     .expect_suggestion = or expect the lint to compare the pointers metadata and addresses
 
-lint_associated_const_elided_lifetime = {$elided ->
-        [true] `&` without an explicit lifetime name cannot be used here
-        *[false] `'_` cannot be used here
-    }
-    .suggestion = use the `'static` lifetime
-    .note = cannot automatically infer `'static` because of other lifetimes in scope
-
 lint_async_fn_in_trait = use of `async fn` in public traits is discouraged as auto trait bounds cannot be specified
     .note = you can suppress this lint if you plan to use the trait only in your own code, or do not care about auto traits like `Send` on the `Future`
     .suggestion = you can alternatively desugar to a normal `fn` that returns `impl Future` and add any desired bounds such as `Send`, but these cannot be relaxed without a breaking API change
@@ -330,10 +319,6 @@ lint_forgetting_references = calls to `std::mem::forget` with a reference instea
 lint_function_casts_as_integer = direct cast of function item into an integer
     .cast_as_fn = first cast to a pointer `as *const ()`
 
-lint_hidden_glob_reexport = private item shadows public glob re-export
-    .note_glob_reexport = the name `{$name}` in the {$namespace} namespace is supposed to be publicly re-exported here
-    .note_private_item = but the private item here shadows it
-
 lint_hidden_lifetime_parameters = hidden lifetime parameters in types are deprecated
 
 lint_identifier_non_ascii_char = identifier contains non-ASCII characters
@@ -912,9 +897,6 @@ lint_unknown_lint =
 lint_unknown_tool_in_scoped_lint = unknown tool name `{$tool_name}` found in scoped lint: `{$tool_name}::{$lint_name}`
     .help = add `#![register_tool({$tool_name})]` to the crate root
 
-lint_unnecessary_qualification = unnecessary qualification
-    .suggestion = remove the unnecessary path segments
-
 lint_unpredictable_fn_pointer_comparisons = function pointer comparisons do not produce meaningful results since their addresses are not guaranteed to be unique
     .note_duplicated_fn = the address of the same function can vary between different codegen units
     .note_deduplicated_fn = furthermore, different functions could have the same address after being merged together
diff --git a/compiler/rustc_lint/src/early/diagnostics.rs b/compiler/rustc_lint/src/early/diagnostics.rs
@@ -135,53 +135,6 @@ pub fn decorate_builtin_lint(
         BuiltinLintDiag::SingleUseLifetime { use_span: None, deletion_span, ident, .. } => {
             lints::UnusedLifetime { deletion_span, ident }.decorate_lint(diag);
         }
-        BuiltinLintDiag::AmbiguousGlobReexports {
-            name,
-            namespace,
-            first_reexport_span,
-            duplicate_reexport_span,
-        } => {
-            lints::AmbiguousGlobReexports {
-                first_reexport: first_reexport_span,
-                duplicate_reexport: duplicate_reexport_span,
-                name,
-                namespace,
-            }
-            .decorate_lint(diag);
-        }
-        BuiltinLintDiag::HiddenGlobReexports {
-            name,
-            namespace,
-            glob_reexport_span,
-            private_item_span,
-        } => {
-            lints::HiddenGlobReexports {
-                glob_reexport: glob_reexport_span,
-                private_item: private_item_span,
-
-                name,
-                namespace,
-            }
-            .decorate_lint(diag);
-        }
-        BuiltinLintDiag::UnusedQualifications { removal_span } => {
-            lints::UnusedQualifications { removal_span }.decorate_lint(diag);
-        }
-        BuiltinLintDiag::AssociatedConstElidedLifetime {
-            elided,
-            span: lt_span,
-            lifetimes_in_scope,
-        } => {
-            let lt_span = if elided { lt_span.shrink_to_hi() } else { lt_span };
-            let code = if elided { "'static " } else { "'static" };
-            lints::AssociatedConstElidedLifetime {
-                span: lt_span,
-                code,
-                elided,
-                lifetimes_in_scope,
-            }
-            .decorate_lint(diag);
-        }
         BuiltinLintDiag::AttributeLint(kind) => decorate_attribute_lint(sess, tcx, &kind, diag),
     }
 }
diff --git a/compiler/rustc_lint/src/lints.rs b/compiler/rustc_lint/src/lints.rs
@@ -2710,51 +2710,6 @@ pub(crate) struct UnusedLifetime {
     pub ident: Ident,
 }
 
-#[derive(LintDiagnostic)]
-#[diag(lint_ambiguous_glob_reexport)]
-pub(crate) struct AmbiguousGlobReexports {
-    #[label(lint_label_first_reexport)]
-    pub first_reexport: Span,
-    #[label(lint_label_duplicate_reexport)]
-    pub duplicate_reexport: Span,
-
-    pub name: String,
-    // FIXME: make this translatable
-    pub namespace: String,
-}
-
-#[derive(LintDiagnostic)]
-#[diag(lint_hidden_glob_reexport)]
-pub(crate) struct HiddenGlobReexports {
-    #[note(lint_note_glob_reexport)]
-    pub glob_reexport: Span,
-    #[note(lint_note_private_item)]
-    pub private_item: Span,
-
-    pub name: String,
-    // FIXME: make this translatable
-    pub namespace: String,
-}
-
-#[derive(LintDiagnostic)]
-#[diag(lint_unnecessary_qualification)]
-pub(crate) struct UnusedQualifications {
-    #[suggestion(style = "verbose", code = "", applicability = "machine-applicable")]
-    pub removal_span: Span,
-}
-
-#[derive(LintDiagnostic)]
-#[diag(lint_associated_const_elided_lifetime)]
-pub(crate) struct AssociatedConstElidedLifetime {
-    #[suggestion(style = "verbose", code = "{code}", applicability = "machine-applicable")]
-    pub span: Span,
-
-    pub code: &'static str,
-    pub elided: bool,
-    #[note]
-    pub lifetimes_in_scope: MultiSpan,
-}
-
 #[derive(LintDiagnostic)]
 #[diag(lint_static_mut_refs_lint)]
 pub(crate) struct RefOfMutStatic<'a> {
diff --git a/compiler/rustc_lint_defs/src/lib.rs b/compiler/rustc_lint_defs/src/lib.rs
@@ -7,7 +7,7 @@ use rustc_data_structures::fx::FxIndexSet;
 use rustc_data_structures::stable_hasher::{
     HashStable, StableCompare, StableHasher, ToStableHashKey,
 };
-use rustc_error_messages::{DiagArgValue, IntoDiagArg, MultiSpan};
+use rustc_error_messages::{DiagArgValue, IntoDiagArg};
 use rustc_hir_id::{HashStableContext, HirId, ItemLocalId};
 use rustc_macros::{Decodable, Encodable, HashStable_Generic};
 use rustc_span::def_id::DefPathHash;
@@ -684,35 +684,6 @@ pub enum BuiltinLintDiag {
         use_span: Option<(Span, bool)>,
         ident: Ident,
     },
-    AmbiguousGlobReexports {
-        /// The name for which collision(s) have occurred.
-        name: String,
-        /// The name space for which the collision(s) occurred in.
-        namespace: String,
-        /// Span where the name is first re-exported.
-        first_reexport_span: Span,
-        /// Span where the same name is also re-exported.
-        duplicate_reexport_span: Span,
-    },
-    HiddenGlobReexports {
-        /// The name of the local binding which shadows the glob re-export.
-        name: String,
-        /// The namespace for which the shadowing occurred in.
-        namespace: String,
-        /// The glob reexport that is shadowed by the local binding.
-        glob_reexport_span: Span,
-        /// The local binding that shadows the glob reexport.
-        private_item_span: Span,
-    },
-    UnusedQualifications {
-        /// The span of the unnecessarily-qualified path to remove.
-        removal_span: Span,
-    },
-    AssociatedConstElidedLifetime {
-        elided: bool,
-        span: Span,
-        lifetimes_in_scope: MultiSpan,
-    },
     AttributeLint(AttributeLintKind),
 }
 
diff --git a/compiler/rustc_resolve/messages.ftl b/compiler/rustc_resolve/messages.ftl
@@ -8,6 +8,10 @@ resolve_add_as_non_derive =
 resolve_added_macro_use =
     have you added the `#[macro_use]` on the module/import?
 
+resolve_ambiguous_glob_reexport = ambiguous glob re-exports
+    .label_first_reexport = the name `{$name}` in the {$namespace} namespace is first re-exported here
+    .label_duplicate_reexport = but the name `{$name}` in the {$namespace} namespace is also re-exported here
+
 resolve_ancestor_only =
     visibilities can only be restricted to ancestor modules
 
@@ -17,6 +21,13 @@ resolve_anonymous_lifetime_non_gat_report_error = missing lifetime in associated
 
 resolve_arguments_macro_use_not_allowed = arguments to `macro_use` are not allowed here
 
+resolve_associated_const_elided_lifetime = {$elided ->
+        [true] `&` without an explicit lifetime name cannot be used here
+        *[false] `'_` cannot be used here
+    }
+    .suggestion = use the `'static` lifetime
+    .note = cannot automatically infer `'static` because of other lifetimes in scope
+
 resolve_associated_const_with_similar_name_exists =
     there is an associated constant with a similar name
 
@@ -197,6 +208,10 @@ resolve_generic_params_from_outer_item_static = a `static` is a separate item fr
 
 resolve_generic_params_from_outer_item_ty_param = type parameter from outer item
 
+resolve_hidden_glob_reexport = private item shadows public glob re-export
+    .note_glob_reexport = the name `{$name}` in the {$namespace} namespace is supposed to be publicly re-exported here
+    .note_private_item = but the private item here shadows it
+
 resolve_ident_bound_more_than_once_in_parameter_list =
     identifier `{$identifier}` is bound more than once in this parameter list
     .label = used as parameter more than once
@@ -490,6 +505,9 @@ resolve_unknown_diagnostic_attribute_typo_sugg = an attribute with a similar nam
 resolve_unnamed_crate_root_import =
     crate root imports need to be explicitly named: `use crate as name;`
 
+resolve_unnecessary_qualification = unnecessary qualification
+    .suggestion = remove the unnecessary path segments
+
 resolve_unreachable_label =
     use of unreachable label `{$name}`
     .label = unreachable label `{$name}`
diff --git a/compiler/rustc_resolve/src/check_unused.rs b/compiler/rustc_resolve/src/check_unused.rs
@@ -554,7 +554,7 @@ impl Resolver<'_, '_> {
                 UNUSED_QUALIFICATIONS,
                 unn_qua.node_id,
                 unn_qua.path_span,
-                BuiltinLintDiag::UnusedQualifications { removal_span: unn_qua.removal_span },
+                crate::errors::UnusedQualifications { removal_span: unn_qua.removal_span },
             );
         }
 
diff --git a/compiler/rustc_resolve/src/errors.rs b/compiler/rustc_resolve/src/errors.rs
@@ -1486,3 +1486,45 @@ impl<'a> LintDiagnostic<'a, ()> for Ambiguity {
         self.decorate(diag);
     }
 }
+
+#[derive(LintDiagnostic)]
+#[diag(resolve_unnecessary_qualification)]
+pub(crate) struct UnusedQualifications {
+    #[suggestion(style = "verbose", code = "", applicability = "machine-applicable")]
+    pub removal_span: Span,
+}
+
+#[derive(LintDiagnostic)]
+#[diag(resolve_associated_const_elided_lifetime)]
+pub(crate) struct AssociatedConstElidedLifetime {
+    #[suggestion(style = "verbose", code = "{code}", applicability = "machine-applicable")]
+    pub span: Span,
+    pub code: &'static str,
+    pub elided: bool,
+    #[note]
+    pub lifetimes_in_scope: MultiSpan,
+}
+
+#[derive(LintDiagnostic)]
+#[diag(resolve_ambiguous_glob_reexport)]
+pub(crate) struct AmbiguousGlobReexports {
+    #[label(resolve_label_first_reexport)]
+    pub first_reexport: Span,
+    #[label(resolve_label_duplicate_reexport)]
+    pub duplicate_reexport: Span,
+    pub name: String,
+    // FIXME: make this translatable
+    pub namespace: &'static str,
+}
+
+#[derive(LintDiagnostic)]
+#[diag(resolve_hidden_glob_reexport)]
+pub(crate) struct HiddenGlobReexports {
+    #[note(resolve_note_glob_reexport)]
+    pub glob_reexport: Span,
+    #[note(resolve_note_private_item)]
+    pub private_item: Span,
+    pub name: Symbol,
+    // FIXME: make this translatable
+    pub namespace: &'static str,
+}
diff --git a/compiler/rustc_resolve/src/imports.rs b/compiler/rustc_resolve/src/imports.rs
@@ -666,11 +666,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                         AMBIGUOUS_GLOB_REEXPORTS,
                         import.root_id,
                         import.root_span,
-                        BuiltinLintDiag::AmbiguousGlobReexports {
+                        crate::errors::AmbiguousGlobReexports {
+                            first_reexport: import.root_span,
+                            duplicate_reexport: amb_binding.span,
                             name: key.ident.to_string(),
-                            namespace: key.ns.descr().to_string(),
-                            first_reexport_span: import.root_span,
-                            duplicate_reexport_span: amb_binding.span,
+                            namespace: key.ns.descr(),
                         },
                     );
                 }
@@ -699,11 +699,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                                 HIDDEN_GLOB_REEXPORTS,
                                 binding_id,
                                 binding.span,
-                                BuiltinLintDiag::HiddenGlobReexports {
-                                    name: key.ident.name.to_string(),
-                                    namespace: key.ns.descr().to_owned(),
-                                    glob_reexport_span: glob_binding.span,
-                                    private_item_span: binding.span,
+                                crate::errors::HiddenGlobReexports {
+                                    glob_reexport: glob_binding.span,
+                                    private_item: binding.span,
+                                    name: key.ident.name,
+                                    namespace: key.ns.descr(),
                                 },
                             );
                         }
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
@@ -1852,13 +1852,15 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                         );
                         return;
                     } else if emit_lint {
+                        let span = lifetime.ident.span;
                         self.r.lint_buffer.buffer_lint(
                             lint::builtin::ELIDED_LIFETIMES_IN_ASSOCIATED_CONSTANT,
                             node_id,
-                            lifetime.ident.span,
-                            lint::BuiltinLintDiag::AssociatedConstElidedLifetime {
+                            span,
+                            errors::AssociatedConstElidedLifetime {
+                                span: if elided { span.shrink_to_hi() } else { span },
                                 elided,
-                                span: lifetime.ident.span,
+                                code: if elided { "'static " } else { "'static" },
                                 lifetimes_in_scope: lifetimes_in_scope.into(),
                             },
                         );

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ impl Resolver<'_, '_> {`
`554`	`554`	`UNUSED_QUALIFICATIONS,`
`555`	`555`	`unn_qua.node_id,`
`556`	`556`	`unn_qua.path_span,`
`557`		`- BuiltinLintDiag::UnusedQualifications { removal_span: unn_qua.removal_span },`
	`557`	`+ crate::errors::UnusedQualifications { removal_span: unn_qua.removal_span },`
`558`	`558`	`);`
`559`	`559`	`}`
`560`	`560`