Merge branch 'main' into make

Author: Wandalen

Cargo.lock

@@ -7,7 +7,6 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-plib = { path = "../plib" }
 gettext-rs.workspace = true
 clap.workspace = true
 libc.workspace = true
@@ -17,6 +16,9 @@ lazy_static = "1.4"
 lexical = { version = "6.1", features = ["format"] }
 rand = {version = "0.8", default-features = false, features = ["small_rng"] }
 
+[dev-dependencies]
+plib = { path = "../plib" }
+
 [lints]
 workspace = true
 

awk/Cargo.toml

@@ -11,8 +11,7 @@ use crate::compiler::compile_program;
 use crate::interpreter::interpret;
 use clap::Parser;
 use compiler::SourceFile;
-use gettextrs::{bind_textdomain_codeset, gettext, textdomain};
-use plib::PROJECT_NAME;
+use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
 use std::error::Error;
 use std::fmt::Display;
 use std::io::Read;
@@ -56,8 +55,9 @@ fn exit_if_error<T, U: Display>(r: Result<T, U>) -> T {
 }
 
 fn main() -> Result<(), Box<dyn Error>> {
-    textdomain(PROJECT_NAME)?;
-    bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
+    setlocale(LocaleCategory::LcAll, "");
+    textdomain(env!("PROJECT_NAME"))?;
+    bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
 
     let args = Args::parse();
 

awk/src/main.rs

@@ -1,4 +1,4 @@
-use plib::{run_test, run_test_with_checker, TestPlan};
+use plib::testing::{run_test, run_test_with_checker, TestPlan};
 
 fn test_awk(args: Vec<String>, expected_output: &str) {
     run_test(TestPlan {

awk/tests/integration.rs

@@ -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/Cargo.toml

@@ -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/bc.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/expr.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/bc/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();

calc/tests/expr/mod.rs

@@ -22,7 +22,9 @@ use plib::PROJECT_NAME;
 #[command(
     version,
     about = gettext("time - time a simple command or give resource usage"),
-    help_template = gettext("{about-with-newline}\nUsage: {usage}\n\nArguments:\n{positionals}\n\nOptions:\n{options}")
+    help_template = gettext("{about}\n\nUsage: {usage}\n\nArguments:\n{positionals}\n\nOptions:\n{options}"),
+    disable_help_flag = true,
+    disable_version_flag = true,
 )]
 struct Args {
     #[arg(
@@ -41,6 +43,12 @@ struct Args {
         help = gettext("Arguments for the utility")
     )]
     arguments: Vec<String>,
+
+    #[arg(short, long, help = gettext("Print help"), action = clap::ArgAction::HelpLong)]
+    help: Option<bool>,
+
+    #[arg(short = 'V', long, help = gettext("Print version"), action = clap::ArgAction::Version)]
+    version: Option<bool>,
 }
 
 enum TimeError {