Rollup merge of rust-lang#137834 - lolbinarycat:rustc_fluent_macro-13…

…7815, r=BoxyUwU

rustc_fluent_macro: use CARGO_CRATE_NAME instead of CARGO_PKG_NAME

fixes rust-lang#137815

compiler/rustc_fluent_macro/src/fluent.rs

@@ -78,8 +78,8 @@ fn failed(crate_name: &Ident) -> proc_macro::TokenStream {
 
 /// See [rustc_fluent_macro::fluent_messages].
 pub(crate) fn fluent_messages(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let crate_name = std::env::var("CARGO_PKG_NAME")
-        // If `CARGO_PKG_NAME` is missing, then we're probably running in a test, so use
+    let crate_name = std::env::var("CARGO_CRATE_NAME")
+        // If `CARGO_CRATE_NAME` is missing, then we're probably running in a test, so use
         // `no_crate`.
         .unwrap_or_else(|_| "no_crate".to_string())
         .replace("rustc_", "");

tests/run-make/rustc_fluent_macro-hyphen-package/Cargo.toml

@@ -0,0 +1,4 @@
+[package]
+name = "some-name"
+version = "0.0.0"
+edition = "2024"

tests/run-make/rustc_fluent_macro-hyphen-package/messages.ftl

@@ -0,0 +1 @@
+some_name_whatever_message = hello

tests/run-make/rustc_fluent_macro-hyphen-package/rmake.rs

@@ -0,0 +1,8 @@
+use run_make_support::external_deps::cargo::cargo;
+
+// test to make sure that `rustc_fluent_macro` correctly handles
+// packages that have hyphens in their package name.
+
+fn main() {
+    cargo().arg("build").arg("--manifest-path=./Cargo.toml").run();
+}

tests/run-make/rustc_fluent_macro-hyphen-package/src/lib.rs

@@ -0,0 +1,7 @@
+#![feature(rustc_private)]
+
+extern crate rustc_driver;
+extern crate rustc_errors;
+extern crate rustc_fluent_macro;
+
+rustc_fluent_macro::fluent_messages!("../messages.ftl");