Merge pull request #330 from fox0/env

display: Use compile-time macro env!

Author: jgarzik

.cargo/config.toml

@@ -0,0 +1,2 @@
+[env]
+PROJECT_NAME = "posixutils-rs"

display/Cargo.toml

@@ -8,10 +8,12 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-plib = { path = "../plib" }
 clap.workspace = true
 gettext-rs.workspace = true
 
+[dev-dependencies]
+plib = { path = "../plib" }
+
 [lints]
 workspace = true
 
@@ -22,4 +24,3 @@ path = "./echo.rs"
 [[bin]]
 name = "printf"
 path = "./printf.rs"
-

display/echo.rs

@@ -14,7 +14,6 @@
 //
 
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use std::io::{self, Write};
 
 fn translate_str(skip_nl: bool, s: &str) -> String {
@@ -73,8 +72,8 @@ fn translate_str(skip_nl: bool, s: &str) -> String {
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
 
     let mut args: Vec<String> = std::env::args().collect();
     args.remove(0);

display/printf.rs

@@ -12,7 +12,6 @@
 //
 
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use std::io::{self, Write};
 
 // the following structure is a printf format conversion specifier
@@ -322,8 +321,8 @@ fn do_printf(format: &str, args: &[String]) -> io::Result<()> {
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     setlocale(LocaleCategory::LcAll, "");
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
 
     let args: Vec<String> = std::env::args().collect();
 

display/tests/echo/mod.rs

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-use plib::{run_test, TestPlan};
+use plib::testing::{run_test, TestPlan};
 
 fn echo_test(args: &[&str], expected_output: &str) {
     let str_args: Vec<String> = args.iter().map(|s| String::from(*s)).collect();

display/tests/printf/mod.rs

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-use plib::{run_test, TestPlan};
+use plib::testing::{run_test, TestPlan};
 
 #[test]
 fn test_basic_string_output() {