Merge branch 'uutils:main' into main

Author: matrixhead

.github/workflows/CICD.yml

@@ -309,7 +309,7 @@ jobs:
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.4
     - name: Test
-      run: cargo nextest run --hide-progress-bar --profile ci ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
+      run: cargo nextest run --hide-progress-bar --profile ci --features ${{ matrix.job.features }}
       env:
         RUST_BACKTRACE: "1"
 
@@ -336,7 +336,7 @@ jobs:
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.4
     - name: Test
-      run: cargo nextest run --hide-progress-bar --profile ci ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
+      run: cargo nextest run --hide-progress-bar --profile ci --features ${{ matrix.job.features }}
       env:
         RUST_BACKTRACE: "1"
 

Cargo.lock

@@ -263,7 +263,7 @@ binary-heap-plus = "0.5.0"
 bstr = "1.9.1"
 bytecount = "0.6.7"
 byteorder = "1.5.0"
-chrono = { version = "0.4.37", default-features = false, features = [
+chrono = { version = "0.4.38", default-features = false, features = [
   "std",
   "alloc",
   "clock",

Cargo.toml

@@ -43,12 +43,10 @@ pub(crate) trait Arithmetic: Copy + Sized {
     fn one(&self) -> Self::ModInt {
         self.to_mod(1)
     }
+
     fn minus_one(&self) -> Self::ModInt {
         self.to_mod(self.modulus() - 1)
     }
-    fn zero(&self) -> Self::ModInt {
-        self.to_mod(0)
-    }
 }
 
 #[derive(Clone, Copy, Debug)]

src/uu/factor/src/numeric/montgomery.rs

@@ -13,6 +13,7 @@ use num_traits::{
 };
 use std::fmt::{Debug, Display};
 
+#[allow(dead_code)] // Rust doesn't recognize the use in the macro
 pub(crate) trait Int:
     Display + Debug + PrimInt + OverflowingAdd + WrappingNeg + WrappingSub + WrappingMul
 {
@@ -23,6 +24,7 @@ pub(crate) trait Int:
     fn as_u128(&self) -> u128;
 }
 
+#[allow(dead_code)] // Rust doesn't recognize the use in the macro
 pub(crate) trait DoubleInt: Int {
     /// An integer type with twice the width of `Self`.
     /// In particular, multiplications (of `Int` values) can be performed in

src/uu/factor/src/numeric/traits.rs

@@ -38,8 +38,6 @@ pub struct OutputInfo {
 
     /// The number of bytes in a block. (This is the size of the largest datatype in `spaced_formatters`.)
     pub byte_size_block: usize,
-    /// The width of a block in human readable format. (The size of the largest format.)
-    pub print_width_block: usize,
     /// All formats.
     spaced_formatters: Vec<SpacedFormatterItemInfo>,
     /// determines if duplicate output lines should be printed, or
@@ -78,7 +76,6 @@ impl OutputInfo {
             byte_size_line: line_bytes,
             print_width_line,
             byte_size_block,
-            print_width_block,
             spaced_formatters,
             output_duplicates,
         }