Merge pull request #6110 from cre4ture/feature/factor_fix_gnu_tests_w…

…ith_num_prime Feature/factor fix gnu tests with num prime
uutils · Apr 21, 2024 · 0b78b77 · 0b78b77
2 parents 64027e5 + d202bab
commit 0b78b77
Show file tree

Hide file tree

Showing 22 changed files with 298 additions and 1,690 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -298,6 +298,7 @@ nix = { version = "0.28", default-features = false }
 nom = "7.1.3"
 notify = { version = "=6.0.1", features = ["macos_kqueue"] }
 num-bigint = "0.4.4"
+num-prime = "0.4.3"
 num-traits = "0.2.18"
 number_prefix = "0.4"
 once_cell = "1.19.0"
@@ -480,6 +481,7 @@ chrono = { workspace = true }
 filetime = { workspace = true }
 glob = { workspace = true }
 libc = { workspace = true }
+num-prime = { workspace = true }
 pretty_assertions = "1"
 rand = { workspace = true }
 regex = { workspace = true }

diff --git a/deny.toml b/deny.toml
@@ -101,6 +101,8 @@ skip = [
   { name = "terminal_size", version = "0.2.6" },
   # filetime, parking_lot_core
   { name = "redox_syscall", version = "0.4.1" },
+  # num-prime, rust-ini
+  { name = "hashbrown", version = "0.12.3" },
 ]
 # spell-checker: enable
 

diff --git a/src/uu/factor/Cargo.toml b/src/uu/factor/Cargo.toml
@@ -21,6 +21,8 @@ num-traits = { workspace = true }
 rand = { workspace = true }
 smallvec = { workspace = true }
 uucore = { workspace = true }
+num-bigint = { workspace = true }
+num-prime = { workspace = true }
 
 [dev-dependencies]
 quickcheck = "1.0.3"
@@ -30,4 +32,4 @@ name = "factor"
 path = "src/main.rs"
 
 [lib]
-path = "src/cli.rs"
+path = "src/factor.rs"
diff --git a/src/uu/factor/build.rs b/src/uu/factor/build.rs