screen: Use compile-time macro env!

Author: fox0

Cargo.lock

@@ -8,7 +8,6 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-plib = { path = "../plib" }
 clap.workspace = true
 gettext-rs.workspace = true
 terminfo = "0.8"
@@ -29,4 +28,3 @@ path = "./tabs.rs"
 [[bin]]
 name = "tput"
 path = "./tput.rs"
-

screen/Cargo.toml

@@ -12,12 +12,12 @@
 
 mod osdata;
 
+use std::collections::HashMap;
+use std::io::{self, Error, ErrorKind};
+
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
 use osdata::{ParamType, PARG, PNEG};
-use plib::PROJECT_NAME;
-use std::collections::HashMap;
-use std::io::{self, Error, ErrorKind};
 use termios::{
     cc_t, cfgetispeed, cfgetospeed, cfsetispeed, cfsetospeed, speed_t, tcflag_t, tcsetattr,
     Termios, TCSANOW,
@@ -552,12 +552,11 @@ fn stty_set(ti: Termios, args: &Args) -> io::Result<()> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    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();
 
     // load termio settings
     let ti = Termios::from_fd(libc::STDIN_FILENO)?;

screen/stty.rs

@@ -12,10 +12,10 @@
 // - gettext("Specify repetitive tab stops separated by ({}) columns")
 //
 
+use std::io::{self, Error, ErrorKind, Write};
+
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
-use std::io::{self, Error, ErrorKind, Write};
 use terminfo::{capability as cap, Database};
 
 // arbitrarily chosen.  todo: search if POSIX-ly correct.
@@ -210,12 +210,11 @@ fn set_hw_tabs(info: &Database, tabstops: &Vec<u16>) -> io::Result<()> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    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 info = match args.term {
         None => Database::from_env().unwrap(),

screen/tabs.rs

@@ -11,10 +11,10 @@
 // - read init-file and reset-file data from filesystem
 //
 
+use std::io;
+
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
-use std::io;
 use terminfo::{capability as cap, Database};
 
 #[derive(Parser)]
@@ -72,12 +72,11 @@ fn tput_clear(info: Database) -> terminfo::Result<()> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // parse command line arguments
-    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 info = match args.term {
         None => Database::from_env().unwrap(),