fs/make: 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
 libc.workspace = true

fs/Cargo.toml

@@ -15,7 +15,6 @@ use crate::mntent::MountTable;
 
 use clap::Parser;
 use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
-use plib::PROJECT_NAME;
 #[cfg(target_os = "macos")]
 use std::ffi::CStr;
 use std::{cmp, ffi::CString, fmt::Display, io};
@@ -364,12 +363,11 @@ fn mask_fs_by_file(info: &mut MountList, filename: &str) -> 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 mut info = read_mount_info()?;
 

fs/df.rs

@@ -107,6 +107,58 @@ struct Args {
     targets: Vec<OsString>,
 }
 
+fn print_rules(rules: &BTreeMap<String, BTreeSet<String>>) {
+    print!("{:?}", rules);
+}
+
+/// Parse the makefile at the given path, or the first default makefile found.
+/// If no makefile is found, print an error message and exit.
+fn parse_makefile(path: Option<impl AsRef<Path>>) -> Result<Makefile, ErrorCode> {
+    let path = path.as_ref().map(|p| p.as_ref());
+
+    let path = match path {
+        Some(path) => path,
+        None => {
+            let mut makefile = None;
+            for m in MAKEFILE_PATH.iter() {
+                let path = Path::new(m);
+                if path.exists() {
+                    makefile = Some(path);
+                    break;
+                }
+            }
+            if let Some(makefile) = makefile {
+                makefile
+            } else {
+                return Err(NoMakefile);
+            }
+        }
+    };
+
+    let contents = if path == Path::new("-") {
+        read_stdin()?
+    } else {
+        match fs::read_to_string(path) {
+            Ok(contents) => contents,
+            Err(err) => {
+                return Err(IoError(err.kind()));
+            }
+        }
+    };
+
+    match Makefile::from_str(&contents) {
+        Ok(makefile) => Ok(makefile),
+        Err(err) => Err(ErrorCode::ParserError { constraint: err }),
+    }
+}
+
+/// Reads the makefile from `stdin` until EOF (Ctrl + D)
+fn read_stdin() -> Result<String, ErrorCode> {
+    let mut buffer = String::new();
+    io::stdin().read_to_string(&mut buffer)?;
+    Ok(buffer)
+}
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     setlocale(LocaleCategory::LcAll, "");
     textdomain(env!("PROJECT_NAME"))?;
@@ -229,55 +281,3 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
     process::exit(status_code);
 }
-
-fn print_rules(rules: &BTreeMap<String, BTreeSet<String>>) {
-    print!("{:?}", rules);
-}
-
-/// Parse the makefile at the given path, or the first default makefile found.
-/// If no makefile is found, print an error message and exit.
-fn parse_makefile(path: Option<impl AsRef<Path>>) -> Result<Makefile, ErrorCode> {
-    let path = path.as_ref().map(|p| p.as_ref());
-
-    let path = match path {
-        Some(path) => path,
-        None => {
-            let mut makefile = None;
-            for m in MAKEFILE_PATH.iter() {
-                let path = Path::new(m);
-                if path.exists() {
-                    makefile = Some(path);
-                    break;
-                }
-            }
-            if let Some(makefile) = makefile {
-                makefile
-            } else {
-                return Err(NoMakefile);
-            }
-        }
-    };
-
-    let contents = if path == Path::new("-") {
-        read_stdin()?
-    } else {
-        match fs::read_to_string(path) {
-            Ok(contents) => contents,
-            Err(err) => {
-                return Err(IoError(err.kind()));
-            }
-        }
-    };
-
-    match Makefile::from_str(&contents) {
-        Ok(makefile) => Ok(makefile),
-        Err(err) => Err(ErrorCode::ParserError { constraint: err }),
-    }
-}
-
-/// Reads the makefile from `stdin` until EOF (Ctrl + D)
-fn read_stdin() -> Result<String, ErrorCode> {
-    let mut buffer = String::new();
-    io::stdin().read_to_string(&mut buffer)?;
-    Ok(buffer)
-}