Emit the usages suggestions as multipart suggestions

Author: Urgau

compiler/rustc_lint/src/lints.rs

@@ -1349,7 +1349,7 @@ pub(crate) struct NonUpperCaseGlobal<'a> {
     #[subdiagnostic]
     pub sub: NonUpperCaseGlobalSub,
     #[subdiagnostic]
-    pub usages: Vec<NonUpperCaseGlobalSub>,
+    pub usages: Option<NonUpperCaseGlobalSubUsages>,
 }
 
 #[derive(Subdiagnostic)]
@@ -1367,6 +1367,23 @@ pub(crate) enum NonUpperCaseGlobalSub {
     },
 }
 
+pub(crate) struct NonUpperCaseGlobalSubUsages {
+    pub(crate) spans: Vec<Span>,
+    pub(crate) replace: String,
+}
+
+impl Subdiagnostic for NonUpperCaseGlobalSubUsages {
+    fn add_to_diag<G: EmissionGuarantee>(self, diag: &mut Diag<'_, G>) {
+        if !self.spans.is_empty() {
+            diag.multipart_suggestion_verbose(
+                crate::fluent_generated::_subdiag::suggestion,
+                self.spans.into_iter().map(|sp| (sp, self.replace.clone())).collect(),
+                Applicability::MaybeIncorrect,
+            );
+        }
+    }
+}
+
 // noop_method_call.rs
 #[derive(LintDiagnostic)]
 #[diag(lint_noop_method_call)]

compiler/rustc_lint/src/nonstandard_style.rs

@@ -14,7 +14,7 @@ use {rustc_ast as ast, rustc_hir as hir};
 
 use crate::lints::{
     NonCamelCaseType, NonCamelCaseTypeSub, NonSnakeCaseDiag, NonSnakeCaseDiagSub,
-    NonUpperCaseGlobal, NonUpperCaseGlobalSub,
+    NonUpperCaseGlobal, NonUpperCaseGlobalSub, NonUpperCaseGlobalSubUsages,
 };
 use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
 
@@ -534,9 +534,12 @@ impl NonUpperCaseGlobals {
             let usages = if let Some(did) = did {
                 let mut usage_collector = UsageCollector { cx, did, collected: Vec::new() };
                 cx.tcx.hir_walk_toplevel_module(&mut usage_collector);
-                usage_collector.collected.into_iter().map(|span| sub(span)).collect()
+                Some(NonUpperCaseGlobalSubUsages {
+                    spans: usage_collector.collected,
+                    replace: uc.clone(),
+                })
             } else {
-                vec![]
+                None
             };
 
             cx.emit_span_lint(

tests/ui/lint/lint-non-uppercase-usages.fixed

@@ -1,4 +1,4 @@
-//
+// Checks that the `non_upper_case_globals` emits suggestions for usages as well
 // <https://github.com/rust-lang/rust/issues/124061>
 
 //@ check-pass

tests/ui/lint/lint-non-uppercase-usages.stderr

@@ -12,13 +12,11 @@ LL + const MY_STATIC: u32 = 0;
    |
 help: convert the identifier to upper case
    |
-LL - const LOL: u32 = my_static + 0;
-LL + const LOL: u32 = MY_STATIC + 0;
-   |
-help: convert the identifier to upper case
-   |
-LL -     let _a = crate::my_static;
-LL +     let _a = crate::MY_STATIC;
+LL ~ const LOL: u32 = MY_STATIC + 0;
+LL |
+...
+LL | fn main() {
+LL ~     let _a = crate::MY_STATIC;
    |
 
 warning: constant `fooFOO` should have an upper case name
@@ -34,13 +32,9 @@ LL +     static FOO_FOO: Cell<usize> = unreachable!();
    |
 help: convert the identifier to upper case
    |
-LL -     fooFOO.set(9);
-LL +     FOO_FOO.set(9);
-   |
-help: convert the identifier to upper case
-   |
-LL -     println!("{}", fooFOO.get());
-LL +     println!("{}", FOO_FOO.get());
+LL ~     FOO_FOO.set(9);
+LL |
+LL ~     println!("{}", FOO_FOO.get());
    |
 
 warning: const parameter `foo` should have an upper case name