From 20d19a1f886f7357762efbf45ab37897da4cf00d Mon Sep 17 00:00:00 2001 From: sylvestre Date: Mon, 10 Jul 2023 03:04:37 +0000 Subject: [PATCH] deploy: f0e8d44e6e64ee3354f95864c0a25b74cf1c1151 --- dev/implementors/core/clone/trait.Clone.js | 2 +- dev/implementors/core/cmp/trait.Eq.js | 2 +- dev/implementors/core/cmp/trait.PartialEq.js | 2 +- dev/implementors/core/fmt/trait.Debug.js | 2 +- .../core/marker/trait.StructuralEq.js | 2 +- .../core/marker/trait.StructuralPartialEq.js | 2 +- dev/src/uu_ls/ls.rs.html | 2 + dev/src/uu_nl/nl.rs.html | 2 +- dev/src/uu_seq/error.rs.html | 46 +++++++------------ dev/src/uu_seq/seq.rs.html | 14 ++++-- dev/src/uucore/mods/version_cmp.rs.html | 38 ++++----------- dev/uu_ls/fn.list.html | 2 +- dev/uu_ls/fn.uu_app.html | 2 +- dev/uu_ls/index.html | 2 +- dev/uu_seq/fn.uu_app.html | 2 +- dev/uu_seq/index.html | 2 +- dev/uucore/version_cmp/fn.version_cmp.html | 2 +- dev/uucore/version_cmp/index.html | 2 +- 18 files changed, 52 insertions(+), 76 deletions(-) diff --git a/dev/implementors/core/clone/trait.Clone.js b/dev/implementors/core/clone/trait.Clone.js index a97e080d2..c65edd653 100644 --- a/dev/implementors/core/clone/trait.Clone.js +++ b/dev/implementors/core/clone/trait.Clone.js @@ -9,6 +9,6 @@ "uu_numfmt":[["impl Clone for RoundMethod"]], "uu_sort":[["impl Clone for GlobalSettings"],["impl Clone for GeneralF64ParseResult"],["impl<'a> Clone for Line<'a>"]], "uu_stty":[["impl<T: Clone> Clone for Flag<T>"]], -"uu_tail":[["impl Clone for BytesChunk"],["impl Clone for Signum"],["impl Clone for FollowMode"]], +"uu_tail":[["impl Clone for BytesChunk"],["impl Clone for FollowMode"],["impl Clone for Signum"]], "uucore":[["impl Clone for Verbosity"],["impl Clone for VerbosityLevel"],["impl Clone for Group"],["impl Clone for BackupMode"],["impl Clone for FsUsage"],["impl Clone for ShortcutValueParser"],["impl Clone for MissingHandling"],["impl Clone for Format"],["impl Clone for Passwd"],["impl Clone for Quotes"],["impl Clone for ResolveMode"],["impl Clone for UpdateMode"],["impl Clone for MountInfo"]] };if (window.register_implementors) {window.register_implementors(implementors);} else {window.pending_implementors = implementors;}})() \ No newline at end of file diff --git a/dev/implementors/core/cmp/trait.Eq.js b/dev/implementors/core/cmp/trait.Eq.js index a5f4df685..607e5fbf1 100644 --- a/dev/implementors/core/cmp/trait.Eq.js +++ b/dev/implementors/core/cmp/trait.Eq.js @@ -7,6 +7,6 @@ "uu_ls":[["impl Eq for Format"]], "uu_mv":[["impl Eq for OverwriteMode"]], "uu_numfmt":[["impl Eq for FormatOptions"],["impl Eq for InvalidModes"]], -"uu_tail":[["impl Eq for Signum"],["impl Eq for FollowMode"],["impl Eq for BytesChunk"],["impl Eq for FilterMode"]], +"uu_tail":[["impl Eq for Signum"],["impl Eq for FollowMode"],["impl Eq for FilterMode"],["impl Eq for BytesChunk"]], "uucore":[["impl Eq for MissingHandling"],["impl Eq for BackupMode"],["impl Eq for Range"],["impl Eq for FileInformation"],["impl Eq for ResolveMode"],["impl Eq for Verbosity"],["impl Eq for ParseSizeError"],["impl Eq for UpdateMode"],["impl Eq for BackupError"],["impl Eq for TraverseSymlinks"],["impl Eq for VerbosityLevel"]] };if (window.register_implementors) {window.register_implementors(implementors);} else {window.pending_implementors = implementors;}})() \ No newline at end of file diff --git a/dev/implementors/core/cmp/trait.PartialEq.js b/dev/implementors/core/cmp/trait.PartialEq.js index e3f52ecae..627749c77 100644 --- a/dev/implementors/core/cmp/trait.PartialEq.js +++ b/dev/implementors/core/cmp/trait.PartialEq.js @@ -8,6 +8,6 @@ "uu_mv":[["impl PartialEq<OverwriteMode> for OverwriteMode"]], "uu_numfmt":[["impl PartialEq<FormatOptions> for FormatOptions"],["impl PartialEq<InvalidModes> for InvalidModes"]], "uu_sort":[["impl PartialEq<GeneralF64ParseResult> for GeneralF64ParseResult"]], -"uu_tail":[["impl PartialEq<BytesChunk> for BytesChunk"],["impl PartialEq<FilterMode> for FilterMode"],["impl PartialEq<FollowMode> for FollowMode"],["impl PartialEq<Signum> for Signum"]], +"uu_tail":[["impl PartialEq<FollowMode> for FollowMode"],["impl PartialEq<FilterMode> for FilterMode"],["impl PartialEq<Signum> for Signum"],["impl PartialEq<BytesChunk> for BytesChunk"]], "uucore":[["impl PartialEq<ResolveMode> for ResolveMode"],["impl PartialEq<ParseSizeError> for ParseSizeError"],["impl PartialEq<BackupError> for BackupError"],["impl PartialEq<UpdateMode> for UpdateMode"],["impl PartialEq<TraverseSymlinks> for TraverseSymlinks"],["impl PartialEq<FileInformation> for FileInformation"],["impl PartialEq<BackupMode> for BackupMode"],["impl PartialEq<Range> for Range"],["impl PartialEq<MissingHandling> for MissingHandling"],["impl PartialEq<Verbosity> for Verbosity"],["impl PartialEq<VerbosityLevel> for VerbosityLevel"]] };if (window.register_implementors) {window.register_implementors(implementors);} else {window.pending_implementors = implementors;}})() \ No newline at end of file diff --git a/dev/implementors/core/fmt/trait.Debug.js b/dev/implementors/core/fmt/trait.Debug.js index 1ec3a90b1..3de6e4d28 100644 --- a/dev/implementors/core/fmt/trait.Debug.js +++ b/dev/implementors/core/fmt/trait.Debug.js @@ -9,6 +9,6 @@ "uu_sort":[["impl<'a> Debug for Line<'a>"],["impl Debug for GeneralF64ParseResult"]], "uu_stat":[["impl Debug for OutputType"]], "uu_stty":[["impl Debug for TermSize"],["impl<T: Debug> Debug for Flag<T>"]], -"uu_tail":[["impl Debug for Settings"],["impl Debug for LinesChunk"],["impl Debug for BytesChunk"],["impl Debug for VerificationResult"],["impl Debug for FollowMode"],["impl Debug for FilterMode"],["impl Debug for Signum"]], +"uu_tail":[["impl Debug for LinesChunk"],["impl Debug for BytesChunk"],["impl Debug for FilterMode"],["impl Debug for Settings"],["impl Debug for VerificationResult"],["impl Debug for Signum"],["impl Debug for FollowMode"]], "uucore":[["impl Debug for UUsageError"],["impl Debug for FsUsage"],["impl Debug for ResolveMode"],["impl Debug for ClapErrorWrapper"],["impl Debug for Verbosity"],["impl Debug for BackupMode"],["impl Debug for MissingHandling"],["impl Debug for Range"],["impl Debug for DecodeError"],["impl Debug for Group"],["impl Debug for MountInfo"],["impl Debug for USimpleError"],["impl Debug for UIoError"],["impl Debug for ParseSizeError"],["impl Debug for UpdateMode"],["impl Debug for Passwd"],["impl Debug for ExitCode"],["impl Debug for VerbosityLevel"],["impl Debug for BackupError"]] };if (window.register_implementors) {window.register_implementors(implementors);} else {window.pending_implementors = implementors;}})() \ No newline at end of file diff --git a/dev/implementors/core/marker/trait.StructuralEq.js b/dev/implementors/core/marker/trait.StructuralEq.js index 8d3aeea1d..c272f0fb7 100644 --- a/dev/implementors/core/marker/trait.StructuralEq.js +++ b/dev/implementors/core/marker/trait.StructuralEq.js @@ -7,6 +7,6 @@ "uu_ls":[["impl StructuralEq for Format"]], "uu_mv":[["impl StructuralEq for OverwriteMode"]], "uu_numfmt":[["impl StructuralEq for FormatOptions"],["impl StructuralEq for InvalidModes"]], -"uu_tail":[["impl StructuralEq for FilterMode"],["impl StructuralEq for FollowMode"],["impl StructuralEq for Signum"],["impl StructuralEq for BytesChunk"]], +"uu_tail":[["impl StructuralEq for BytesChunk"],["impl StructuralEq for FilterMode"],["impl StructuralEq for FollowMode"],["impl StructuralEq for Signum"]], "uucore":[["impl StructuralEq for BackupError"],["impl StructuralEq for BackupMode"],["impl StructuralEq for Range"],["impl StructuralEq for UpdateMode"],["impl StructuralEq for Verbosity"],["impl StructuralEq for VerbosityLevel"],["impl StructuralEq for ResolveMode"],["impl StructuralEq for ParseSizeError"],["impl StructuralEq for TraverseSymlinks"],["impl StructuralEq for MissingHandling"]] };if (window.register_implementors) {window.register_implementors(implementors);} else {window.pending_implementors = implementors;}})() \ No newline at end of file diff --git a/dev/implementors/core/marker/trait.StructuralPartialEq.js b/dev/implementors/core/marker/trait.StructuralPartialEq.js index bd5321bb8..7bce47c05 100644 --- a/dev/implementors/core/marker/trait.StructuralPartialEq.js +++ b/dev/implementors/core/marker/trait.StructuralPartialEq.js @@ -8,6 +8,6 @@ "uu_mv":[["impl StructuralPartialEq for OverwriteMode"]], "uu_numfmt":[["impl StructuralPartialEq for FormatOptions"],["impl StructuralPartialEq for InvalidModes"]], "uu_sort":[["impl StructuralPartialEq for GeneralF64ParseResult"]], -"uu_tail":[["impl StructuralPartialEq for FollowMode"],["impl StructuralPartialEq for Signum"],["impl StructuralPartialEq for FilterMode"],["impl StructuralPartialEq for BytesChunk"]], +"uu_tail":[["impl StructuralPartialEq for BytesChunk"],["impl StructuralPartialEq for FollowMode"],["impl StructuralPartialEq for Signum"],["impl StructuralPartialEq for FilterMode"]], "uucore":[["impl StructuralPartialEq for BackupError"],["impl StructuralPartialEq for MissingHandling"],["impl StructuralPartialEq for BackupMode"],["impl StructuralPartialEq for ResolveMode"],["impl StructuralPartialEq for Range"],["impl StructuralPartialEq for TraverseSymlinks"],["impl StructuralPartialEq for Verbosity"],["impl StructuralPartialEq for ParseSizeError"],["impl StructuralPartialEq for VerbosityLevel"],["impl StructuralPartialEq for UpdateMode"]] };if (window.register_implementors) {window.register_implementors(implementors);} else {window.pending_implementors = implementors;}})() \ No newline at end of file diff --git a/dev/src/uu_ls/ls.rs.html b/dev/src/uu_ls/ls.rs.html index 9525bce53..24bf51e37 100644 --- a/dev/src/uu_ls/ls.rs.html +++ b/dev/src/uu_ls/ls.rs.html @@ -3156,6 +3156,7 @@ 3156 3157 3158 +3159 
// This file is part of the uutils coreutils package.
 //
 // (c) Jeremiah Peschka <jeremiah.peschka@gmail.com>
@@ -4360,6 +4361,7 @@
             Arg::new(options::quoting::LITERAL)
                 .short('N')
                 .long(options::quoting::LITERAL)
+                .alias("l")
                 .help("Use literal quoting style. Equivalent to `--quoting-style=literal`")
                 .overrides_with_all([
                     options::QUOTING_STYLE,
diff --git a/dev/src/uu_nl/nl.rs.html b/dev/src/uu_nl/nl.rs.html
index 7b9302101..9be0d707d 100644
--- a/dev/src/uu_nl/nl.rs.html
+++ b/dev/src/uu_nl/nl.rs.html
@@ -572,7 +572,7 @@
                 .short('b')
                 .long(options::BODY_NUMBERING)
                 .help("use STYLE for numbering body lines")
-                .value_name("SYNTAX"),
+                .value_name("STYLE"),
         )
         .arg(
             Arg::new(options::SECTION_DELIMITER)
diff --git a/dev/src/uu_seq/error.rs.html b/dev/src/uu_seq/error.rs.html
index 48e48d2d6..37ef814fd 100644
--- a/dev/src/uu_seq/error.rs.html
+++ b/dev/src/uu_seq/error.rs.html
@@ -59,18 +59,11 @@
 59
 60
 61
-62
-63
-64
-65
-66
-67
-68
 
//  * This file is part of the uutils coreutils package.
 //  *
 //  * For the full copyright and license information, please view the LICENSE
 //  * file that was distributed with this source code.
-// spell-checker:ignore numberparse argtype
+// spell-checker:ignore numberparse
 //! Errors returned by seq.
 use std::error::Error;
 use std::fmt::Display;
@@ -93,29 +86,11 @@
     /// The parameter is the increment argument as a [`String`] as read
     /// from the command line.
     ZeroIncrement(String),
+
+    /// No arguments were passed to this function, 1 or more is required
+    NoArguments,
 }
 
-impl SeqError {
-    /// The [`String`] argument as read from the command-line.
-    fn arg(&self) -> &str {
-        match self {
-            Self::ParseError(s, _) => s,
-            Self::ZeroIncrement(s) => s,
-        }
-    }
-
-    /// The type of argument that is causing the error.
-    fn argtype(&self) -> &str {
-        match self {
-            Self::ParseError(_, e) => match e {
-                ParseNumberError::Float => "floating point argument",
-                ParseNumberError::Nan => "'not-a-number' argument",
-                ParseNumberError::Hex => "hexadecimal argument",
-            },
-            Self::ZeroIncrement(_) => "Zero increment value",
-        }
-    }
-}
 impl UError for SeqError {
     /// Always return 1.
     fn code(&self) -> i32 {
@@ -131,7 +106,18 @@
 
 impl Display for SeqError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "invalid {}: {}", self.argtype(), self.arg().quote())
+        match self {
+            Self::ParseError(s, e) => {
+                let error_type = match e {
+                    ParseNumberError::Float => "floating point",
+                    ParseNumberError::Nan => "'not-a-number'",
+                    ParseNumberError::Hex => "hexadecimal",
+                };
+                write!(f, "invalid {error_type} argument: {}", s.quote())
+            }
+            Self::ZeroIncrement(s) => write!(f, "invalid Zero increment value: {}", s.quote()),
+            Self::NoArguments => write!(f, "missing operand"),
+        }
     }
 }
\ No newline at end of file diff --git a/dev/src/uu_seq/seq.rs.html b/dev/src/uu_seq/seq.rs.html index 146bd6c65..8d60c9187 100644 --- a/dev/src/uu_seq/seq.rs.html +++ b/dev/src/uu_seq/seq.rs.html @@ -356,6 +356,9 @@ 356 357 358 +359 +360 +361 
//  * This file is part of the uutils coreutils package.
 //  *
 //  * For the full copyright and license information, please view the LICENSE
@@ -416,10 +419,13 @@
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let matches = uu_app().try_get_matches_from(args)?;
 
-    let numbers = matches
-        .get_many::<String>(ARG_NUMBERS)
-        .unwrap()
-        .collect::<Vec<_>>();
+    let numbers_option = matches.get_many::<String>(ARG_NUMBERS);
+
+    if numbers_option.is_none() {
+        return Err(SeqError::NoArguments.into());
+    }
+
+    let numbers = numbers_option.unwrap().collect::<Vec<_>>();
 
     let options = SeqOptions {
         separator: matches
diff --git a/dev/src/uucore/mods/version_cmp.rs.html b/dev/src/uucore/mods/version_cmp.rs.html
index 0738aefba..41b9c103b 100644
--- a/dev/src/uucore/mods/version_cmp.rs.html
+++ b/dev/src/uucore/mods/version_cmp.rs.html
@@ -350,15 +350,6 @@
 350
 351
 352
-353
-354
-355
-356
-357
-358
-359
-360
-361
 
use std::cmp::Ordering;
 
 /// Compares the non-digit parts of a version.
@@ -467,7 +458,7 @@
     // 1. Compare leading non-numerical part
     // 2. Compare leading numerical part
     // 3. Repeat
-    loop {
+    while !a.is_empty() || !b.is_empty() {
         let a_numerical_start = a.find(|c: char| c.is_ascii_digit()).unwrap_or(a.len());
         let b_numerical_start = b.find(|c: char| c.is_ascii_digit()).unwrap_or(b.len());
 
@@ -500,12 +491,9 @@
 
         a = &a[a_numerical_end..];
         b = &b[b_numerical_end..];
-
-        if a.is_empty() && b.is_empty() {
-            // Default to the lexical comparison.
-            return str_cmp;
-        }
     }
+
+    Ordering::Equal
 }
 
 #[cfg(test)]
@@ -590,14 +578,14 @@
         // Leading zeroes
         assert_eq!(
             version_cmp("012", "12"),
-            Ordering::Less,
-            "A single leading zero can make a difference"
+            Ordering::Equal,
+            "A single leading zero does not make a difference"
         );
 
         assert_eq!(
             version_cmp("000800", "0000800"),
-            Ordering::Greater,
-            "Leading number of zeroes is used even if both non-zero number of zeros"
+            Ordering::Equal,
+            "Multiple leading zeros do not make a difference"
         );
 
         // Numbers and other characters combined
@@ -641,14 +629,8 @@
 
         assert_eq!(
             version_cmp("aa10aa0022", "aa010aa022"),
-            Ordering::Greater,
-            "The leading zeroes of the first number has priority."
-        );
-
-        assert_eq!(
-            version_cmp("aa10aa0022", "aa10aa022"),
-            Ordering::Less,
-            "The leading zeroes of other numbers than the first are used."
+            Ordering::Equal,
+            "Test multiple numeric values with leading zeros"
         );
 
         assert_eq!(
@@ -668,7 +650,7 @@
 
         assert_eq!(
             version_cmp("aa2000000000000000000000bb", "aa002000000000000000000000bb"),
-            Ordering::Greater,
+            Ordering::Equal,
             "Leading zeroes for numbers larger than u64::MAX are \
             handled correctly without crashing"
         );
diff --git a/dev/uu_ls/fn.list.html b/dev/uu_ls/fn.list.html
index 1319c587a..bd04d4f22 100644
--- a/dev/uu_ls/fn.list.html
+++ b/dev/uu_ls/fn.list.html
@@ -1 +1 @@
-list in uu_ls - Rust
Function uu_ls::list
source · 
pub fn list(locs: Vec<&Path>, config: &Config) -> UResult<()>

\ No newline at end of file
+list in uu_ls - Rust
Function uu_ls::list
source · 
pub fn list(locs: Vec<&Path>, config: &Config) -> UResult<()>

\ No newline at end of file
diff --git a/dev/uu_ls/fn.uu_app.html b/dev/uu_ls/fn.uu_app.html
index 55e13b92c..5fe5babf0 100644
--- a/dev/uu_ls/fn.uu_app.html
+++ b/dev/uu_ls/fn.uu_app.html
@@ -1 +1 @@
-uu_app in uu_ls - Rust
Function uu_ls::uu_app
source · 
pub fn uu_app() -> Command

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

\ No newline at end of file
diff --git a/dev/uu_ls/index.html b/dev/uu_ls/index.html
index 21e178e59..4646d972c 100644
--- a/dev/uu_ls/index.html
+++ b/dev/uu_ls/index.html
@@ -1 +1 @@
-uu_ls - Rust
Crate uu_ls
source · 
Modules
Structs
Enums
Functions

\ No newline at end of file
+uu_ls - Rust
Crate uu_ls
source · 
Modules
Structs
Enums
Functions

\ No newline at end of file
diff --git a/dev/uu_seq/fn.uu_app.html b/dev/uu_seq/fn.uu_app.html
index 3943d91e8..da2349779 100644
--- a/dev/uu_seq/fn.uu_app.html
+++ b/dev/uu_seq/fn.uu_app.html
@@ -1 +1 @@
-uu_app in uu_seq - Rust
Function uu_seq::uu_app
source · 
pub fn uu_app() -> Command

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

\ No newline at end of file
diff --git a/dev/uu_seq/index.html b/dev/uu_seq/index.html
index 91a46eea8..02d1de90d 100644
--- a/dev/uu_seq/index.html
+++ b/dev/uu_seq/index.html
@@ -1 +1 @@
-uu_seq - Rust
Crate uu_seq
source · 
Functions

\ No newline at end of file
+uu_seq - Rust
Crate uu_seq
source · 
Functions

\ No newline at end of file
diff --git a/dev/uucore/version_cmp/fn.version_cmp.html b/dev/uucore/version_cmp/fn.version_cmp.html
index 7899baf5a..ad912a271 100644
--- a/dev/uucore/version_cmp/fn.version_cmp.html
+++ b/dev/uucore/version_cmp/fn.version_cmp.html
@@ -1 +1 @@
-version_cmp in uucore::version_cmp - Rust
Function uucore::version_cmp::version_cmp
source · 
pub fn version_cmp(a: &str, b: &str) -> Ordering

\ No newline at end of file
+version_cmp in uucore::version_cmp - Rust
Function uucore::version_cmp::version_cmp
source · 
pub fn version_cmp(a: &str, b: &str) -> Ordering

\ No newline at end of file
diff --git a/dev/uucore/version_cmp/index.html b/dev/uucore/version_cmp/index.html
index 6f2dd30e1..1742fbd4e 100644
--- a/dev/uucore/version_cmp/index.html
+++ b/dev/uucore/version_cmp/index.html
@@ -1 +1 @@
-uucore::version_cmp - Rust
Module uucore::version_cmp
source · 
Functions

\ No newline at end of file
+uucore::version_cmp - Rust
Module uucore::version_cmp
source · 
Functions

\ No newline at end of file