From 346dac77131e8c2dfe018f2eb9474f91c94800cd Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Sun, 17 Nov 2024 08:31:16 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Restore=20use=20of=20concat=5Fst?=
 =?UTF-8?q?ring!=20macro=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/pagetop/src/lib.rs         |  2 +-
 packages/pagetop/src/prelude.rs     |  2 +-
 packages/pagetop/src/util/config.rs | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/pagetop/src/lib.rs b/packages/pagetop/src/lib.rs
index ecdffaf9..cbda48c5 100644
--- a/packages/pagetop/src/lib.rs
+++ b/packages/pagetop/src/lib.rs
@@ -74,7 +74,7 @@
 
 // RE-EXPORTED *************************************************************************************
 
-pub use concat_string::concat_string as join;
+pub use concat_string::concat_string;
 
 /// Enables flexible identifier concatenation in macros, allowing new items with pasted identifiers.
 pub use paste::paste;
diff --git a/packages/pagetop/src/prelude.rs b/packages/pagetop/src/prelude.rs
index 9fdedbcb..76c29b03 100644
--- a/packages/pagetop/src/prelude.rs
+++ b/packages/pagetop/src/prelude.rs
@@ -2,7 +2,7 @@
 
 // RE-EXPORTED.
 
-pub use crate::{join, main, paste, test};
+pub use crate::{concat_string, main, paste, test};
 
 pub use crate::{AutoDefault, StaticResources, TypeId, Weight};
 
diff --git a/packages/pagetop/src/util/config.rs b/packages/pagetop/src/util/config.rs
index 98c02f38..ad628ed3 100644
--- a/packages/pagetop/src/util/config.rs
+++ b/packages/pagetop/src/util/config.rs
@@ -1,6 +1,6 @@
 //! Retrieve settings values from configuration files.
 
-use crate::join;
+use crate::concat_string;
 use crate::util::data::ConfigData;
 use crate::util::file::File;
 
@@ -24,7 +24,7 @@ pub static CONFIG_DATA: LazyLock<ConfigData> = LazyLock::new(|| {
         .unwrap_or_else(|_| "config".to_string());
 
     // Execution mode based on the environment variable PAGETOP_RUN_MODE, defaults to 'default'.
-    let run_mode = env::var("PAGETOP_RUN_MODE").unwrap_or_else(|_| "default".into());
+    let rm = env::var("PAGETOP_RUN_MODE").unwrap_or_else(|_| "default".into());
 
     // Initialize settings.
     let mut settings = ConfigData::default();
@@ -32,19 +32,19 @@ pub static CONFIG_DATA: LazyLock<ConfigData> = LazyLock::new(|| {
     // Merge (optional) configuration files and set the execution mode.
     settings
         // First, add the common configuration for all environments. Defaults to 'common.toml'.
-        .merge(File::with_name(&join!(config_dir, "/common.toml")).required(false))
+        .merge(File::with_name(&concat_string!(config_dir, "/common.toml")).required(false))
         .expect("Failed to merge common configuration (common.toml)")
         // Add the environment-specific configuration. Defaults to 'default.toml'.
-        .merge(File::with_name(&join!(config_dir, "/", run_mode, ".toml")).required(false))
-        .expect(&format!("Failed to merge {run_mode}.toml configuration"))
+        .merge(File::with_name(&concat_string!(config_dir, "/", rm, ".toml")).required(false))
+        .expect(&format!("Failed to merge {rm}.toml configuration"))
         // Add reserved local configuration for the environment. Defaults to 'local.default.toml'.
-        .merge(File::with_name(&join!(config_dir, "/local.", run_mode, ".toml")).required(false))
+        .merge(File::with_name(&concat_string!(config_dir, "/local.", rm, ".toml")).required(false))
         .expect("Failed to merge reserved local environment configuration")
         // Add the general reserved local configuration. Defaults to 'local.toml'.
-        .merge(File::with_name(&join!(config_dir, "/local.toml")).required(false))
+        .merge(File::with_name(&concat_string!(config_dir, "/local.toml")).required(false))
         .expect("Failed to merge general reserved local configuration")
         // Save the execution mode.
-        .set("app.run_mode", run_mode)
+        .set("app.run_mode", rm)
         .expect("Failed to set application run mode");
 
     settings