Merge branch 'main' into sort/sort-debug-warn.sh

Author: mattsu2020

.github/workflows/GnuTests.yml

@@ -2,7 +2,7 @@ name: GnuTests
 
 # spell-checker:ignore (abbrev/names) CodeCov gnulib GnuTests Swatinem
 # spell-checker:ignore (jargon) submodules devel
-# spell-checker:ignore (libs/utils) autopoint chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
+# spell-checker:ignore (libs/utils) chksum dpkg getenforce getlimits gperf lcov libexpect limactl pyinotify setenforce shopt valgrind libattr libcap taiki-e zstd cpio
 # spell-checker:ignore (options) Ccodegen Coverflow Cpanic Zpanic
 # spell-checker:ignore (people) Dawid Dziurla * dawidd dtolnay
 # spell-checker:ignore (vars) FILESET SUBDIRS XPASS
@@ -68,7 +68,7 @@ jobs:
         ## Install dependencies
         sudo apt-get update
         ## Check that build-gnu.sh works on the non SELinux system by installing libselinux only on lima
-        sudo apt-get install -y autopoint gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
+        sudo apt-get install -y gperf gdb python3-pyinotify valgrind libexpect-perl libacl1-dev libattr1-dev libcap-dev attr quilt
         curl http://launchpadlibrarian.net/831710181/automake_1.18.1-3_all.deb > automake-1.18.deb
         sudo dpkg -i --force-depends automake-1.18.deb
     - name: Add various locales
@@ -245,7 +245,7 @@ jobs:
     - name: Install dependencies in VM
       run: |
         lima sudo dnf -y update
-        lima sudo dnf -y install git autoconf autopoint bison gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel automake patch quilt
+        lima sudo dnf -y install git autoconf bison gperf gcc gdb jq libacl-devel libattr-devel libcap-devel libselinux-devel attr rustup clang-devel automake patch quilt
         lima rustup-init -y --default-toolchain stable
     - name: Copy the sources to VM
       run: |

src/uu/cp/src/cp.rs

@@ -1279,9 +1279,7 @@ fn parse_path_args(
     };
 
     if options.strip_trailing_slashes {
-        // clippy::assigning_clones added with Rust 1.78
-        // Rust version = 1.76 on OpenBSD stable/7.5
-        #[cfg_attr(not(target_os = "openbsd"), allow(clippy::assigning_clones))]
+        #[allow(clippy::assigning_clones)]
         for source in &mut paths {
             *source = source.components().as_path().to_owned();
         }

src/uu/df/src/filesystem.rs

@@ -291,9 +291,7 @@ mod tests {
         }
 
         #[test]
-        // clippy::assigning_clones added with Rust 1.78
-        // Rust version = 1.76 on OpenBSD stable/7.5
-        #[cfg_attr(not(target_os = "openbsd"), allow(clippy::assigning_clones))]
+        #[allow(clippy::assigning_clones)]
         fn test_dev_name_match() {
             let tmp = tempfile::TempDir::new().expect("Failed to create temp dir");
             let dev_name = std::fs::canonicalize(tmp.path())

src/uu/tail/src/follow/watch.rs

@@ -47,9 +47,7 @@ impl WatcherRx {
             Tested for notify::InotifyWatcher and for notify::PollWatcher.
             */
             if let Some(parent) = path.parent() {
-                // clippy::assigning_clones added with Rust 1.78
-                // Rust version = 1.76 on OpenBSD stable/7.5
-                #[cfg_attr(not(target_os = "openbsd"), allow(clippy::assigning_clones))]
+                #[allow(clippy::assigning_clones)]
                 if parent.is_dir() {
                     path = parent.to_owned();
                 } else {

src/uucore/src/lib/features/parser/num_parser.rs

@@ -7,10 +7,8 @@
 
 // spell-checker:ignore powf copysign prec ilog inity infinit infs bigdecimal extendedbigdecimal biguint underflowed muls
 
-use std::num::NonZeroU64;
-
 use bigdecimal::{
-    BigDecimal, Context,
+    BigDecimal,
     num_bigint::{BigInt, BigUint, Sign},
 };
 use num_traits::Signed;
@@ -398,71 +396,6 @@ fn make_error(overflow: bool, negative: bool) -> ExtendedParserError<ExtendedBig
     }
 }
 
-/// Compute bd**exp using exponentiation by squaring algorithm, while maintaining the
-/// precision specified in ctx (the number of digits would otherwise explode).
-///
-/// Algorithm comes from <https://en.wikipedia.org/wiki/Exponentiation_by_squaring>
-///
-/// TODO: Still pending discussion in <https://github.com/akubera/bigdecimal-rs/issues/147>,
-/// we do lose a little bit of precision, and the last digits may not be correct.
-/// Note: This has been copied from the latest revision in <https://github.com/akubera/bigdecimal-rs/pull/148>,
-/// so it's using minimum Rust version of `bigdecimal-rs`.
-fn pow_with_context(bd: &BigDecimal, exp: i64, ctx: &Context) -> BigDecimal {
-    if exp == 0 {
-        return 1.into();
-    }
-
-    // When performing a multiplication between 2 numbers, we may lose up to 2 digits
-    // of precision.
-    // "Proof": https://github.com/akubera/bigdecimal-rs/issues/147#issuecomment-2793431202
-    const MARGIN_PER_MUL: u64 = 2;
-    // When doing many multiplication, we still introduce additional errors, add 1 more digit
-    // per 10 multiplications.
-    const MUL_PER_MARGIN_EXTRA: u64 = 10;
-
-    fn trim_precision(bd: BigDecimal, ctx: &Context, margin: u64) -> BigDecimal {
-        let prec = ctx.precision().get() + margin;
-        if bd.digits() > prec {
-            bd.with_precision_round(NonZeroU64::new(prec).unwrap(), ctx.rounding_mode())
-        } else {
-            bd
-        }
-    }
-
-    // Count the number of multiplications we're going to perform, one per "1" binary digit
-    // in exp, and the number of times we can divide exp by 2.
-    let mut n = exp.unsigned_abs();
-    // Note: 63 - n.leading_zeros() == n.ilog2, but that's only available in recent Rust versions.
-    let muls = (n.count_ones() + (63 - n.leading_zeros()) - 1) as u64;
-    // Note: div_ceil would be nice to use here, but only available in recent Rust versions.
-    // (see note above about minimum Rust version in use)
-    let margin_extra = (muls + MUL_PER_MARGIN_EXTRA / 2) / MUL_PER_MARGIN_EXTRA;
-    let mut margin = margin_extra + MARGIN_PER_MUL * muls;
-
-    let mut bd_y: BigDecimal = 1.into();
-    let mut bd_x = if exp >= 0 {
-        bd.clone()
-    } else {
-        bd.inverse_with_context(&ctx.with_precision(
-            NonZeroU64::new(ctx.precision().get() + margin + MARGIN_PER_MUL).unwrap(),
-        ))
-    };
-
-    while n > 1 {
-        if n % 2 == 1 {
-            bd_y = trim_precision(&bd_x * bd_y, ctx, margin);
-            margin -= MARGIN_PER_MUL;
-            n -= 1;
-        }
-        bd_x = trim_precision(bd_x.square(), ctx, margin);
-        margin -= MARGIN_PER_MUL;
-        n /= 2;
-    }
-    debug_assert_eq!(margin, margin_extra);
-
-    trim_precision(bd_x * bd_y, ctx, 0)
-}
-
 /// Construct an [`ExtendedBigDecimal`] based on parsed data
 fn construct_extended_big_decimal(
     digits: BigUint,
@@ -510,7 +443,7 @@ fn construct_extended_big_decimal(
         let bd = BigDecimal::from_bigint(signed_digits, 0)
             / BigDecimal::from_bigint(BigInt::from(16).pow(scale as u32), 0);
 
-        // pow_with_context "only" supports i64 values. Just overflow/underflow if the value provided
+        // powi "only" supports i64 values. Just overflow/underflow if the value provided
         // is > 2**64 or < 2**-64.
         let Some(exponent) = exponent.to_i64() else {
             return Err(make_error(exponent.is_positive(), negative));
@@ -520,7 +453,7 @@ fn construct_extended_big_decimal(
         let base: BigDecimal = 2.into();
         // Note: We cannot overflow/underflow BigDecimal here, as we will not be able to reach the
         // maximum/minimum scale (i64 range).
-        let pow2 = pow_with_context(&base, exponent, &Context::default());
+        let pow2 = base.powi(exponent);
 
         bd * pow2
     } else {

src/uucore/src/lib/features/uptime.rs

@@ -501,8 +501,7 @@ mod tests {
         // (This is just a sanity check)
         assert!(
             uptime < 365 * 86400,
-            "Uptime seems unreasonably high: {} seconds",
-            uptime
+            "Uptime seems unreasonably high: {uptime} seconds"
         );
     }
 
@@ -518,9 +517,7 @@ mod tests {
         let diff = (uptime1 - uptime2).abs();
         assert!(
             diff <= 1,
-            "Consecutive uptime calls should be consistent, got {} and {}",
-            uptime1,
-            uptime2
+            "Consecutive uptime calls should be consistent, got {uptime1} and {uptime2}"
         );
     }
 }