Run format and update changelogs after merge of #122

kellpossible · Aug 8, 2024 · 5b46646 · 5b46646
1 parent 81aaf03
commit 5b46646
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/i18n-embed-fl/CHANGELOG.md b/i18n-embed-fl/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog for `i18n-embed-fl`
 
+## master
+
+### Fixes
+
++ Fallback to `std::env::var("CARGO_PKG_NAME")` Fixes [#97](https://github.com/kellpossible/cargo-i18n/issues/97)
+
 ## v0.8.0
 
 ### Breaking

diff --git a/i18n-embed-fl/src/lib.rs b/i18n-embed-fl/src/lib.rs
@@ -343,8 +343,7 @@ pub fn fl(input: TokenStream) -> TokenStream {
     let domain = {
         let manifest = find_crate::Manifest::new().expect("Error reading Cargo.toml");
         manifest.crate_package().map(|pkg| pkg.name).unwrap_or(
-            std::env::var("CARGO_PKG_NAME")
-                .expect("Error fetching `CARGO_PKG_NAME` env"),
+            std::env::var("CARGO_PKG_NAME").expect("Error fetching `CARGO_PKG_NAME` env"),
         )
     };
 

diff --git a/i18n-embed/CHANGELOG.md b/i18n-embed/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog for `i18n-embed`
 
+## master
+
+### Fixes
+
++ Fallback to `std::env::var("CARGO_PKG_NAME")` Fixes [#97](https://github.com/kellpossible/cargo-i18n/issues/97)
+
 ## v0.14.1
 
 ## Internal

diff --git a/i18n-embed/i18n-embed-impl/src/lib.rs b/i18n-embed/i18n-embed-impl/src/lib.rs
@@ -16,8 +16,7 @@ pub fn gettext_language_loader(_: proc_macro::TokenStream) -> proc_macro::TokenS
     let manifest = find_crate::Manifest::new().expect("Error reading Cargo.toml");
     let current_crate_package_name = {
         manifest.crate_package().map(|pkg| pkg.name).unwrap_or(
-            std::env::var("CARGO_PKG_NAME")
-                .expect("Error fetching `CARGO_PKG_NAME` env"),
+            std::env::var("CARGO_PKG_NAME").expect("Error fetching `CARGO_PKG_NAME` env"),
         )
     };
 
@@ -89,10 +88,10 @@ pub fn gettext_language_loader(_: proc_macro::TokenStream) -> proc_macro::TokenS
 #[cfg(feature = "fluent-system")]
 pub fn fluent_language_loader(_: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let manifest = find_crate::Manifest::new().expect("Error reading Cargo.toml");
-    let current_crate_package_name = manifest.crate_package().map(|pkg| pkg.name).unwrap_or(
-        std::env::var("CARGO_PKG_NAME")
-            .expect("Error fetching `CARGO_PKG_NAME` env"),
-    );
+    let current_crate_package_name = manifest
+        .crate_package()
+        .map(|pkg| pkg.name)
+        .unwrap_or(std::env::var("CARGO_PKG_NAME").expect("Error fetching `CARGO_PKG_NAME` env"));
 
     // Special case for when this macro is invoked in i18n-embed tests/docs
     let i18n_embed_crate_name = if current_crate_package_name == "i18n_embed" {