calc: Use compile-time macro env!

Author: fox0

calc/Cargo.toml

@@ -7,7 +7,6 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-plib = { path = "../plib" }
 gettext-rs.workspace = true
 regex.workspace = true
 clap.workspace = true
@@ -17,6 +16,9 @@ lazy_static = "1.4"
 bigdecimal = "0.4"
 rustyline = { version = "14.0", default-features = false }
 
+[dev-dependencies]
+plib = { path = "../plib" }
+
 [lints]
 workspace = true
 

calc/bc.rs

@@ -16,7 +16,6 @@ use bc_util::{
 use clap::Parser;
 
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use rustyline::{error::ReadlineError, DefaultEditor, Result};
 
 mod bc_util;
@@ -45,10 +44,11 @@ fn print_output_or_error(result: ExecutionResult<String>) {
 
 fn main() -> Result<()> {
     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 = Args::parse();
+
     let mut interpreter = Interpreter::default();
 
     if args.define_math_functions {

calc/expr.rs

@@ -8,7 +8,6 @@
 //
 
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 use regex::Regex;
 
 #[derive(Clone, Debug, PartialEq)]
@@ -370,10 +369,9 @@ fn eval_expression(tokens: &[Token]) -> Result<Token, &'static str> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // initialize translations
     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")?;
 
     // tokenize and evaluate the expression
     let arg_tokens = tokenize();

calc/tests/bc/mod.rs

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-use plib::{run_test, TestPlan};
+use plib::testing::{run_test, TestPlan};
 
 fn test_bc(program: &str, expected_output: &str) {
     run_test(TestPlan {

calc/tests/expr/mod.rs

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