i18n: Use compile-time macro env!

Author: fox0

i18n/gencat.rs

@@ -1,7 +1,7 @@
 use byteorder::{BigEndian, ByteOrder, LittleEndian, NativeEndian, WriteBytesExt};
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
+use plib::io::input_stream;
 use std::{
     cell::RefCell,
     collections::BTreeMap,
@@ -295,7 +295,7 @@ impl MessageCatalog {
         input_path: &PathBuf,
         catfile_catalog: Option<MessageCatalog>,
     ) -> Result<Self, Box<dyn std::error::Error>> {
-        let mut file = plib::io::input_stream(input_path, true)?;
+        let mut file = input_stream(input_path, true)?;
 
         let mut input = String::new();
         file.read_to_string(&mut input)?;
@@ -774,11 +774,11 @@ impl MessageCatalog {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args = Args::parse();
-
     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 exit_code = 0;
 

i18n/iconv.rs

@@ -15,7 +15,7 @@ use iconv_lib::{
     utf_32::{self, UTF32Variant},
     utf_8,
 };
-use plib::PROJECT_NAME;
+use plib::io::input_stream;
 use std::{
     collections::HashMap,
     env,
@@ -480,11 +480,11 @@ fn charmap_conversion(
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args = Args::parse();
-
     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();
 
     if args.list_codesets {
         list_encodings();
@@ -517,7 +517,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let inputs: Vec<Box<dyn Read>> = match args.files {
         Some(files) => files
             .into_iter()
-            .map(|file| plib::io::input_stream(&file, true))
+            .map(|file| input_stream(&file, true))
             .collect::<Result<Vec<_>, _>>()?,
         None => vec![Box::new(io::stdin().lock())],
     };

i18n/tests/gencat/mod.rs

@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-use plib::{run_test_u8, TestPlanU8};
+use plib::testing::{run_test_u8, TestPlanU8};
 use std::env;
 use std::path::PathBuf;
 use std::{fs::File, io::Read};

i18n/tests/iconv/mod.rs

@@ -8,7 +8,7 @@
 //
 
 #![allow(non_snake_case)]
-use plib::{run_test_u8, TestPlanU8};
+use plib::testing::{run_test_u8, TestPlanU8};
 use std::env;
 use std::path::PathBuf;
 use std::{fs::File, io::Read};

plib/src/io.rs

@@ -11,8 +11,8 @@ use std::fs;
 use std::io::{self, Read};
 use std::path::PathBuf;
 
+/// open file, or stdin
 pub fn input_stream(pathname: &PathBuf, dashed_stdin: bool) -> io::Result<Box<dyn Read>> {
-    // open file, or stdin
     let path_str = pathname.as_os_str();
     let file: Box<dyn Read> =
         if (dashed_stdin && path_str == "-") || (!dashed_stdin && path_str.is_empty()) {