From be11af4cd5ac8b84cf1fd141e2e1ea1f47b685cf Mon Sep 17 00:00:00 2001
From: Yukang <moorekang@gmail.com>
Date: Sun, 19 Jul 2026 01:40:42 +0800
Subject: [PATCH] Suggest valid command-line crate names

---
 compiler/rustc_session/src/diagnostics.rs                | 9 +++++++++
 compiler/rustc_session/src/output.rs                     | 9 ++++++++-
 .../invalid-crate-name-suggestion-issue-159485.rs        | 7 +++++++
 .../invalid-crate-name-suggestion-issue-159485.stderr    | 7 +++++++
 .../invalid/need-crate-arg-ignore-tidy$x.stderr          | 3 +++
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.rs
 create mode 100644 tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.stderr

diff --git a/compiler/rustc_session/src/diagnostics.rs b/compiler/rustc_session/src/diagnostics.rs
index d1989609cefe2..a06c40f77a73e 100644
--- a/compiler/rustc_session/src/diagnostics.rs
+++ b/compiler/rustc_session/src/diagnostics.rs
@@ -435,11 +435,20 @@ pub(crate) struct CrateNameEmpty {
 
 #[derive(Diagnostic)]
 #[diag("invalid character {$character} in crate name: `{$crate_name}`")]
+#[note("crate names may only contain alphanumeric characters or underscores")]
 pub(crate) struct InvalidCharacterInCrateName {
     #[primary_span]
     pub(crate) span: Option<Span>,
     pub(crate) character: char,
     pub(crate) crate_name: Symbol,
+    #[subdiagnostic]
+    pub(crate) suggestion: Option<InvalidCharacterInCrateNameSuggestion>,
+}
+
+#[derive(Subdiagnostic)]
+#[help("you might have meant to use `--crate-name={$suggested_name}`")]
+pub(crate) struct InvalidCharacterInCrateNameSuggestion {
+    pub(crate) suggested_name: String,
 }
 
 #[derive(Subdiagnostic)]
diff --git a/compiler/rustc_session/src/output.rs b/compiler/rustc_session/src/output.rs
index 120eb04c6e8c4..e2eb46c4ca878 100644
--- a/compiler/rustc_session/src/output.rs
+++ b/compiler/rustc_session/src/output.rs
@@ -6,7 +6,10 @@ use rustc_span::{Span, Symbol};
 
 use crate::Session;
 use crate::config::{CrateType, OutFileName, OutputFilenames, OutputType};
-use crate::diagnostics::{CrateNameEmpty, FileIsNotWriteable, InvalidCharacterInCrateName};
+use crate::diagnostics::{
+    CrateNameEmpty, FileIsNotWriteable, InvalidCharacterInCrateName,
+    InvalidCharacterInCrateNameSuggestion,
+};
 
 pub fn out_filename(
     sess: &Session,
@@ -68,6 +71,10 @@ pub fn validate_crate_name(sess: &Session, crate_name: Symbol, span: Option<Span
             span,
             character: c,
             crate_name,
+            suggestion: span.is_none().then(|| InvalidCharacterInCrateNameSuggestion {
+                suggested_name:
+                    crate_name.as_str().replace(|c: char| c != '_' && !c.is_alphanumeric(), "_"),
+            }),
         }));
     }
 
diff --git a/tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.rs b/tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.rs
new file mode 100644
index 0000000000000..f879ef2215d94
--- /dev/null
+++ b/tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.rs
@@ -0,0 +1,7 @@
+// Invalid command-line crate names should suggest a sanitized replacement.
+
+//@ compile-flags: --crate-name=my-crate
+
+fn main() {}
+
+//~? ERROR invalid character '-' in crate name
diff --git a/tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.stderr b/tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.stderr
new file mode 100644
index 0000000000000..19188367b9716
--- /dev/null
+++ b/tests/ui/compile-flags/invalid/invalid-crate-name-suggestion-issue-159485.stderr
@@ -0,0 +1,7 @@
+error: invalid character '-' in crate name: `my-crate`
+   |
+   = note: crate names may only contain alphanumeric characters or underscores
+   = help: you might have meant to use `--crate-name=my_crate`
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/compile-flags/invalid/need-crate-arg-ignore-tidy$x.stderr b/tests/ui/compile-flags/invalid/need-crate-arg-ignore-tidy$x.stderr
index 3c0c80eae90d9..ee43a05ad24ad 100644
--- a/tests/ui/compile-flags/invalid/need-crate-arg-ignore-tidy$x.stderr
+++ b/tests/ui/compile-flags/invalid/need-crate-arg-ignore-tidy$x.stderr
@@ -1,4 +1,7 @@
 error: invalid character '$' in crate name: `need_crate_arg_ignore_tidy$x`
+   |
+   = note: crate names may only contain alphanumeric characters or underscores
+   = help: you might have meant to use `--crate-name=need_crate_arg_ignore_tidy_x`
 
 error: aborting due to 1 previous error