Merge branch 'main' into naive_histo_diff

Author: gcanat

Cargo.lock

@@ -27,10 +27,18 @@ members = [
 	"i18n"
 ]
 
+[workspace.package]
+repository = "https://github.com/rustcoreutils/posixutils-rs"
+license = "MIT"
+edition = "2021"
+
 [workspace.dependencies]
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "usage", "error-context", "cargo"] }
 chrono = { version = "0.4", default-features = false, features = ["clock"] }
 libc = "0.2"
 regex = "1.10"
 gettext-rs = { path = "./gettext-rs" }
 errno = "0.3"
+
+[workspace.lints]
+

Cargo.toml

@@ -101,6 +101,7 @@ Because it is a FAQ, the major differences between this project and uutils are:
  - [x] strip (Development)
  - [x] tail
  - [x] time
+ - [x] timeout
  - [x] tr
  - [x] true
  - [x] uncompress (compress cat.)
@@ -218,7 +219,6 @@ Because it is a FAQ, the major differences between this project and uutils are:
  - [ ] sed
  - [ ] sh -- Volunteer starting point at https://github.com/rustcoreutils/posixutils-rs/tree/shell
  - [ ] talk (status: in progress)
- - [ ] timeout (status: in progress)
 
 ## Installation
 

README.md

@@ -1,7 +1,9 @@
 [package]
 name = "posixutils-awk"
 version = "0.2.1"
-edition = "2021"
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
@@ -14,6 +16,9 @@ lazy_static = "1.4"
 lexical = { version = "6.1", features = ["format"] }
 rand = {version = "0.8", default-features = false, features = ["small_rng"] }
 
+[lints]
+workspace = true
+
 [[bin]]
 name = "awk"
 path = "src/main.rs"

awk/Cargo.toml

@@ -104,11 +104,7 @@ fn swap_with_default<T: Default>(value: &mut T) -> T {
 
 fn maybe_numeric_string<S: Into<AwkString>>(str: S) -> AwkString {
     let mut str = str.into();
-    let numeric_string = is_valid_number(
-        str.as_str()
-            .trim()
-            .trim_start_matches(|c| c == '+' || c == '-'),
-    );
+    let numeric_string = is_valid_number(str.as_str().trim().trim_start_matches(['+', '-']));
     str.is_numeric = numeric_string;
     str
 }

awk/src/interpreter/mod.rs

@@ -11,7 +11,7 @@ use crate::compiler::compile_program;
 use crate::interpreter::interpret;
 use clap::Parser;
 use compiler::SourceFile;
-use gettextrs::{bind_textdomain_codeset, textdomain};
+use gettextrs::{bind_textdomain_codeset, gettext, textdomain};
 use plib::PROJECT_NAME;
 use std::error::Error;
 use std::fmt::Display;
@@ -22,19 +22,24 @@ mod interpreter;
 mod program;
 mod regex;
 
-/// awk - pattern scanning and processing language
-#[derive(Debug, Parser)]
+#[derive(Parser)]
+#[command(version, about = gettext("awk - pattern scanning and processing language"))]
 struct Args {
-    /// Define the input field separator
-    #[arg(short = 'F')]
+    #[arg(short = 'F', help = gettext("Define the input field separator"))]
     separator_string: Option<String>,
 
-    /// Specify the program files
-    #[arg(short = 'f', action = clap::ArgAction::Append)]
+    #[arg(
+        short = 'f',
+        action = clap::ArgAction::Append,
+        help = gettext("Specify the program files")
+    )]
     program_files: Vec<String>,
 
-    /// Globals assignments, executed before the start of the program
-    #[arg(short = 'v', action = clap::ArgAction::Append)]
+    #[arg(
+        short = 'v',
+        action = clap::ArgAction::Append,
+        help = gettext("Globals assignments, executed before the start of the program")
+    )]
     assignments: Vec<String>,
 
     arguments: Vec<String>,

awk/src/main.rs

@@ -1,7 +1,9 @@
 [package]
 name = "posixutils-calc"
 version = "0.2.1"
-edition = "2021"
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
@@ -14,6 +16,9 @@ lazy_static = "1.4"
 bigdecimal = "0.4"
 rustyline = { version = "14.0", default-features = false }
 
+[lints]
+workspace = true
+
 [[bin]]
 name = "expr"
 path = "./expr.rs"

calc/Cargo.toml

@@ -22,8 +22,8 @@ use rustyline::{error::ReadlineError, DefaultEditor, Result};
 mod bc_util;
 
 /// bc - arbitrary-precision arithmetic language
-#[derive(Debug, Parser)]
-#[command(author, version, about, long_about)]
+#[derive(Parser)]
+#[command(version, about)]
 struct Args {
     #[arg(short = 'l')]
     define_math_functions: bool,

calc/bc.rs

@@ -100,22 +100,21 @@ impl Number {
     }
 
     /// Convert the number to a string in the given base.
-    pub fn to_string(mut self, base: u64) -> String {
-        if self.is_zero() {
+    pub fn to_string(&self, base: u64) -> String {
+        let mut number = self.0.clone();
+        if number.is_zero() {
             return "0".to_string();
         }
 
-        let scale = self.scale();
-
         let mut result = String::new();
         if self.0.is_negative() {
             result.push('-');
-            self.0 = -self.0;
+            number = -number;
         }
 
         let base_ilog10 = base.ilog10();
-        let integer_part = self.0.with_scale(0);
-        let mut fractional_part = self.0 - &integer_part;
+        let integer_part = number.with_scale(0);
+        let mut fractional_part = number - &integer_part;
 
         if integer_part.is_zero() {
             result.push('0');
@@ -145,6 +144,7 @@ impl Number {
 
         result.push('.');
         let mut temp = BigDecimal::one();
+        let scale = self.scale();
         // The standard doesn't specify how many fractional digits to print.
         // Here, we set the scale of the number to the value smallest value of
         // i such that: (base ^ i).digits() > scale.
@@ -557,4 +557,11 @@ mod tests {
         assert_eq!(n.scale(), 1);
         assert_eq!(n.to_string(10), "1.0");
     }
+
+    #[test]
+    fn test_to_string() {
+        let n = Number::parse("4.5", 10).unwrap().negate();
+        assert_eq!(n.to_string(10), "-4.5");
+        assert_eq!(n.to_string(10), "-4.5");
+    }
 }

calc/bc_util/number.rs

@@ -1,10 +1,10 @@
 [package]
 name = "posixutils-datetime"
 version = "0.2.1"
-edition = "2021"
 authors = ["Jeff Garzik"]
-license = "MIT"
-repository = "https://github.com/rustcoreutils/posixutils-rs.git"
+repository.workspace = true
+license.workspace = true
+edition.workspace = true
 
 [dependencies]
 plib = { path = "../plib" }
@@ -13,6 +13,9 @@ gettext-rs.workspace = true
 chrono.workspace = true
 libc.workspace = true
 
+[lints]
+workspace = true
+
 [[bin]]
 name = "cal"
 path = "./cal.rs"