From f8e2417be5847fc3546d377d35e80f50c328d8dd Mon Sep 17 00:00:00 2001 From: sylvestre Date: Sun, 26 Mar 2023 02:42:16 +0000 Subject: [PATCH] deploy: f0e8d44e6e64ee3354f95864c0a25b74cf1c1151 --- dev/src/uu_factor/miller_rabin.rs.html | 40 ++++++++++++- .../uu_factor/numeric/modular_inverse.rs.html | 20 ++++++- dev/src/uu_factor/numeric/montgomery.rs.html | 60 +++++++++++++++++-- dev/src/uu_uniq/uniq.rs.html | 20 +++++-- dev/uu_uniq/fn.uu_app.html | 2 +- dev/uu_uniq/fn.uumain.html | 2 +- dev/uu_uniq/index.html | 2 +- dev/uu_uniq/options/index.html | 2 +- dev/uu_uniq/options/static.ALL_REPEATED.html | 2 +- dev/uu_uniq/options/static.CHECK_CHARS.html | 2 +- dev/uu_uniq/options/static.COUNT.html | 2 +- dev/uu_uniq/options/static.GROUP.html | 2 +- dev/uu_uniq/options/static.IGNORE_CASE.html | 2 +- dev/uu_uniq/options/static.REPEATED.html | 2 +- dev/uu_uniq/options/static.SKIP_CHARS.html | 2 +- dev/uu_uniq/options/static.SKIP_FIELDS.html | 2 +- dev/uu_uniq/options/static.UNIQUE.html | 2 +- .../options/static.ZERO_TERMINATED.html | 2 +- 18 files changed, 139 insertions(+), 29 deletions(-) diff --git a/dev/src/uu_factor/miller_rabin.rs.html b/dev/src/uu_factor/miller_rabin.rs.html index 2afa0692c..ef1c68a9c 100644 --- a/dev/src/uu_factor/miller_rabin.rs.html +++ b/dev/src/uu_factor/miller_rabin.rs.html @@ -207,6 +207,23 @@ 207 208 209 +210 +211 +212 +213 +214 +215 +216 +217 +218 +219 +220 +221 +222 +223 +224 +225 +226 
// * This file is part of the uutils coreutils package.
 // *
 // * (c) 2020 nicoo <nicoo@debian.org>
@@ -321,7 +338,6 @@
 mod tests {
     use super::*;
     use crate::numeric::{traits::DoubleInt, Arithmetic, Montgomery};
-    use crate::parametrized_check;
     use quickcheck::quickcheck;
     use std::iter;
     const LARGEST_U64_PRIME: u64 = 0xFFFFFFFFFFFFFFC5;
@@ -366,7 +382,16 @@
             );
         }
     }
-    parametrized_check!(first_primes);
+
+    #[test]
+    fn first_primes_u32() {
+        first_primes::<u32>();
+    }
+
+    #[test]
+    fn first_primes_u64() {
+        first_primes::<u64>();
+    }
 
     #[test]
     fn one() {
@@ -404,7 +429,16 @@
             }
         }
     }
-    parametrized_check!(small_semiprimes);
+
+    #[test]
+    fn small_semiprimes_u32() {
+        small_semiprimes::<u32>();
+    }
+
+    #[test]
+    fn small_semiprimes_u64() {
+        small_semiprimes::<u64>();
+    }
 
     quickcheck! {
         fn composites(i: u64, j: u64) -> bool {
diff --git a/dev/src/uu_factor/numeric/modular_inverse.rs.html b/dev/src/uu_factor/numeric/modular_inverse.rs.html
index 9250e7b4a..44cb08a24 100644
--- a/dev/src/uu_factor/numeric/modular_inverse.rs.html
+++ b/dev/src/uu_factor/numeric/modular_inverse.rs.html
@@ -77,6 +77,14 @@
 77
 78
 79
+80
+81
+82
+83
+84
+85
+86
+87
 
// * This file is part of the uutils coreutils package.
 // *
 // * (c) 2015 Wiktor Kuropatwa <wiktor.kuropatwa@gmail.com>
@@ -125,7 +133,6 @@
 #[cfg(test)]
 mod tests {
     use super::{super::traits::Int, *};
-    use crate::parametrized_check;
     use quickcheck::quickcheck;
 
     fn small_values<T: Int>() {
@@ -138,7 +145,16 @@
 
         assert!(test_values.all(|x| x.wrapping_mul(&modular_inverse(x)) == one));
     }
-    parametrized_check!(small_values);
+
+    #[test]
+    fn small_values_u32() {
+        small_values::<u32>();
+    }
+
+    #[test]
+    fn small_values_u64() {
+        small_values::<u64>();
+    }
 
     quickcheck! {
         fn random_values_u32(n: u32) -> bool {
diff --git a/dev/src/uu_factor/numeric/montgomery.rs.html b/dev/src/uu_factor/numeric/montgomery.rs.html
index 76f7c0f31..b60f3477c 100644
--- a/dev/src/uu_factor/numeric/montgomery.rs.html
+++ b/dev/src/uu_factor/numeric/montgomery.rs.html
@@ -227,6 +227,31 @@
 227
 228
 229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
 
// * This file is part of the uutils coreutils package.
 // *
 // * (c) 2020 Alex Lyon  <arcterus@mail.com>
@@ -411,8 +436,6 @@
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::parametrized_check;
-
     fn test_add<A: DoubleInt>() {
         for n in 0..100 {
             let n = 2 * n + 1;
@@ -427,7 +450,16 @@
             }
         }
     }
-    parametrized_check!(test_add);
+
+    #[test]
+    fn add_u32() {
+        test_add::<u32>();
+    }
+
+    #[test]
+    fn add_u64() {
+        test_add::<u64>();
+    }
 
     fn test_multiplication<A: DoubleInt>() {
         for n in 0..100 {
@@ -442,7 +474,16 @@
             }
         }
     }
-    parametrized_check!(test_multiplication);
+
+    #[test]
+    fn multiplication_u32() {
+        test_multiplication::<u32>();
+    }
+
+    #[test]
+    fn multiplication_u64() {
+        test_multiplication::<u64>();
+    }
 
     fn test_roundtrip<A: DoubleInt>() {
         for n in 0..100 {
@@ -454,7 +495,16 @@
             }
         }
     }
-    parametrized_check!(test_roundtrip);
+
+    #[test]
+    fn roundtrip_u32() {
+        test_roundtrip::<u32>();
+    }
+
+    #[test]
+    fn roundtrip_u64() {
+        test_roundtrip::<u64>();
+    }
 }
\ No newline at end of file diff --git a/dev/src/uu_uniq/uniq.rs.html b/dev/src/uu_uniq/uniq.rs.html index 2a3038241..9772a2e0c 100644 --- a/dev/src/uu_uniq/uniq.rs.html +++ b/dev/src/uu_uniq/uniq.rs.html @@ -434,6 +434,11 @@ 434 435 436 +437 +438 +439 +440 +441 
//  * This file is part of the uutils coreutils package.
 //  *
 //  * (c) Chirag B Jadwani <chirag.jadwani@gmail.com>
@@ -446,7 +451,6 @@
 use std::io::{self, stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
 use std::path::Path;
 use std::str::FromStr;
-use strum_macros::{AsRefStr, EnumString};
 use uucore::display::Quotable;
 use uucore::error::{FromIo, UResult, USimpleError, UUsageError};
 use uucore::format_usage;
@@ -474,8 +478,7 @@
 
 static ARG_FILES: &str = "files";
 
-#[derive(PartialEq, Clone, Copy, AsRefStr, EnumString)]
-#[strum(serialize_all = "snake_case")]
+#[derive(PartialEq, Clone, Copy)]
 enum Delimiters {
     Append,
     Prepend,
@@ -839,8 +842,15 @@
         .get_one::<String>(options::ALL_REPEATED)
         .or_else(|| matches.get_one::<String>(options::GROUP));
     if let Some(delimiter_arg) = value {
-        Delimiters::from_str(delimiter_arg).unwrap() // All possible values for ALL_REPEATED are Delimiters (of type `&str`)
-    } else if matches.contains_id(options::GROUP) {
+        match delimiter_arg.as_ref() {
+            "append" => Delimiters::Append,
+            "prepend" => Delimiters::Prepend,
+            "separate" => Delimiters::Separate,
+            "both" => Delimiters::Both,
+            "none" => Delimiters::None,
+            _ => unreachable!("Should have been caught by possible values in clap"),
+        }
+    } else if matches.contains_id(options::GROUP) {
         Delimiters::Separate
     } else {
         Delimiters::None
diff --git a/dev/uu_uniq/fn.uu_app.html b/dev/uu_uniq/fn.uu_app.html
index 1c6972a89..fdd6a57de 100644
--- a/dev/uu_uniq/fn.uu_app.html
+++ b/dev/uu_uniq/fn.uu_app.html
@@ -1 +1 @@
-uu_app in uu_uniq - Rust
Function uu_uniq::uu_app
source · 
pub fn uu_app() -> Command

\ No newline at end of file
+uu_app in uu_uniq - Rust
Function uu_uniq::uu_app
source · 
pub fn uu_app() -> Command

\ No newline at end of file
diff --git a/dev/uu_uniq/fn.uumain.html b/dev/uu_uniq/fn.uumain.html
index 1e5deaef4..91845fac9 100644
--- a/dev/uu_uniq/fn.uumain.html
+++ b/dev/uu_uniq/fn.uumain.html
@@ -1 +1 @@
-uumain in uu_uniq - Rust
Function uu_uniq::uumain
source · 
pub fn uumain(args: impl Args) -> i32

\ No newline at end of file
+uumain in uu_uniq - Rust
Function uu_uniq::uumain
source · 
pub fn uumain(args: impl Args) -> i32

\ No newline at end of file
diff --git a/dev/uu_uniq/index.html b/dev/uu_uniq/index.html
index 6238ae41c..77ab156b9 100644
--- a/dev/uu_uniq/index.html
+++ b/dev/uu_uniq/index.html
@@ -1 +1 @@
-uu_uniq - Rust
Crate uu_uniq
source · 
Modules
options
Functions
uu_app
uumain

\ No newline at end of file
+uu_uniq - Rust
Crate uu_uniq
source · 
Modules
options
Functions
uu_app
uumain

\ No newline at end of file
diff --git a/dev/uu_uniq/options/index.html b/dev/uu_uniq/options/index.html
index 84e1104e8..3f22c04e3 100644
--- a/dev/uu_uniq/options/index.html
+++ b/dev/uu_uniq/options/index.html
@@ -1 +1 @@
-uu_uniq::options - Rust
Module uu_uniq::options
source · 
Statics
ALL_REPEATED
CHECK_CHARS
COUNT
GROUP
IGNORE_CASE
REPEATED
SKIP_CHARS
SKIP_FIELDS
UNIQUE
ZERO_TERMINATED

\ No newline at end of file
+uu_uniq::options - Rust
Module uu_uniq::options
source · 
Statics
ALL_REPEATED
CHECK_CHARS
COUNT
GROUP
IGNORE_CASE
REPEATED
SKIP_CHARS
SKIP_FIELDS
UNIQUE
ZERO_TERMINATED

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.ALL_REPEATED.html b/dev/uu_uniq/options/static.ALL_REPEATED.html
index 3d8bac389..cf5759956 100644
--- a/dev/uu_uniq/options/static.ALL_REPEATED.html
+++ b/dev/uu_uniq/options/static.ALL_REPEATED.html
@@ -1 +1 @@
-ALL_REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::ALL_REPEATED
source · 
pub static ALL_REPEATED: &str

\ No newline at end of file
+ALL_REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::ALL_REPEATED
source · 
pub static ALL_REPEATED: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.CHECK_CHARS.html b/dev/uu_uniq/options/static.CHECK_CHARS.html
index 17e3d311a..ac65347c1 100644
--- a/dev/uu_uniq/options/static.CHECK_CHARS.html
+++ b/dev/uu_uniq/options/static.CHECK_CHARS.html
@@ -1 +1 @@
-CHECK_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::CHECK_CHARS
source · 
pub static CHECK_CHARS: &str

\ No newline at end of file
+CHECK_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::CHECK_CHARS
source · 
pub static CHECK_CHARS: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.COUNT.html b/dev/uu_uniq/options/static.COUNT.html
index e4b0f93c2..bc3ce0e26 100644
--- a/dev/uu_uniq/options/static.COUNT.html
+++ b/dev/uu_uniq/options/static.COUNT.html
@@ -1 +1 @@
-COUNT in uu_uniq::options - Rust
Static uu_uniq::options::COUNT
source · 
pub static COUNT: &str

\ No newline at end of file
+COUNT in uu_uniq::options - Rust
Static uu_uniq::options::COUNT
source · 
pub static COUNT: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.GROUP.html b/dev/uu_uniq/options/static.GROUP.html
index 8cc99a659..f0cd5ed27 100644
--- a/dev/uu_uniq/options/static.GROUP.html
+++ b/dev/uu_uniq/options/static.GROUP.html
@@ -1 +1 @@
-GROUP in uu_uniq::options - Rust
Static uu_uniq::options::GROUP
source · 
pub static GROUP: &str

\ No newline at end of file
+GROUP in uu_uniq::options - Rust
Static uu_uniq::options::GROUP
source · 
pub static GROUP: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.IGNORE_CASE.html b/dev/uu_uniq/options/static.IGNORE_CASE.html
index d8ac08a74..c2e0e3d01 100644
--- a/dev/uu_uniq/options/static.IGNORE_CASE.html
+++ b/dev/uu_uniq/options/static.IGNORE_CASE.html
@@ -1 +1 @@
-IGNORE_CASE in uu_uniq::options - Rust
Static uu_uniq::options::IGNORE_CASE
source · 
pub static IGNORE_CASE: &str

\ No newline at end of file
+IGNORE_CASE in uu_uniq::options - Rust
Static uu_uniq::options::IGNORE_CASE
source · 
pub static IGNORE_CASE: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.REPEATED.html b/dev/uu_uniq/options/static.REPEATED.html
index 7c8cbd339..7deabd5b3 100644
--- a/dev/uu_uniq/options/static.REPEATED.html
+++ b/dev/uu_uniq/options/static.REPEATED.html
@@ -1 +1 @@
-REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::REPEATED
source · 
pub static REPEATED: &str

\ No newline at end of file
+REPEATED in uu_uniq::options - Rust
Static uu_uniq::options::REPEATED
source · 
pub static REPEATED: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.SKIP_CHARS.html b/dev/uu_uniq/options/static.SKIP_CHARS.html
index 8e4a3b026..9c1f89e9f 100644
--- a/dev/uu_uniq/options/static.SKIP_CHARS.html
+++ b/dev/uu_uniq/options/static.SKIP_CHARS.html
@@ -1 +1 @@
-SKIP_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_CHARS
source · 
pub static SKIP_CHARS: &str

\ No newline at end of file
+SKIP_CHARS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_CHARS
source · 
pub static SKIP_CHARS: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.SKIP_FIELDS.html b/dev/uu_uniq/options/static.SKIP_FIELDS.html
index dc1da387d..831659135 100644
--- a/dev/uu_uniq/options/static.SKIP_FIELDS.html
+++ b/dev/uu_uniq/options/static.SKIP_FIELDS.html
@@ -1 +1 @@
-SKIP_FIELDS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_FIELDS
source · 
pub static SKIP_FIELDS: &str

\ No newline at end of file
+SKIP_FIELDS in uu_uniq::options - Rust
Static uu_uniq::options::SKIP_FIELDS
source · 
pub static SKIP_FIELDS: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.UNIQUE.html b/dev/uu_uniq/options/static.UNIQUE.html
index 12a91dde5..f40105ce2 100644
--- a/dev/uu_uniq/options/static.UNIQUE.html
+++ b/dev/uu_uniq/options/static.UNIQUE.html
@@ -1 +1 @@
-UNIQUE in uu_uniq::options - Rust
Static uu_uniq::options::UNIQUE
source · 
pub static UNIQUE: &str

\ No newline at end of file
+UNIQUE in uu_uniq::options - Rust
Static uu_uniq::options::UNIQUE
source · 
pub static UNIQUE: &str

\ No newline at end of file
diff --git a/dev/uu_uniq/options/static.ZERO_TERMINATED.html b/dev/uu_uniq/options/static.ZERO_TERMINATED.html
index a8c0809ba..46ba772d3 100644
--- a/dev/uu_uniq/options/static.ZERO_TERMINATED.html
+++ b/dev/uu_uniq/options/static.ZERO_TERMINATED.html
@@ -1 +1 @@
-ZERO_TERMINATED in uu_uniq::options - Rust
Static uu_uniq::options::ZERO_TERMINATED
source · 
pub static ZERO_TERMINATED: &str

\ No newline at end of file
+ZERO_TERMINATED in uu_uniq::options - Rust
Static uu_uniq::options::ZERO_TERMINATED
source · 
pub static ZERO_TERMINATED: &str

\ No newline at end of file