Merge pull request #8859 from cakebaker/clippy_unexpected_cfgs

clippy: move `unexpected_cfgs` to workspace lints & fix warnings in `seq`

Author: sylvestre

Cargo.toml

@@ -1,7 +1,7 @@
 # coreutils (uutils)
 # * see the repository LICENSE, README, and CONTRIBUTING files for more information
 
-# spell-checker:ignore (libs) bigdecimal datetime serde bincode gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind
+# spell-checker:ignore (libs) bigdecimal datetime serde bincode gethostid kqueue libselinux mangen memmap uuhelp startswith constness expl unnested logind cfgs
 
 [package]
 name = "coreutils"
@@ -638,6 +638,9 @@ pedantic = { level = "deny", priority = -1 }
 # Eventually the clippy settings from the `[lints]` section should be moved here.
 # In order to use these, all crates have `[lints] workspace = true` section.
 [workspace.lints.rust]
+# Allow "fuzzing" as a "cfg" condition name
+# https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
 #unused_qualifications = "warn" // TODO: fix warnings in uucore, then re-enable this lint
 
 [workspace.lints.clippy]

src/uu/seq/Cargo.toml

@@ -1,4 +1,4 @@
-# spell-checker:ignore bigdecimal cfgs extendedbigdecimal
+# spell-checker:ignore bigdecimal extendedbigdecimal
 [package]
 name = "uu_seq"
 description = "seq ~ (uutils) display a sequence of numbers"
@@ -12,6 +12,9 @@ categories.workspace = true
 edition.workspace = true
 readme.workspace = true
 
+[lints]
+workspace = true
+
 [lib]
 path = "src/seq.rs"
 
@@ -33,13 +36,3 @@ fluent = { workspace = true }
 [[bin]]
 name = "seq"
 path = "src/main.rs"
-
-# FIXME: this is the only crate that has a separate lints configuration,
-#        which for now means a full copy of all clippy and rust lints here.
-[lints.clippy]
-all = { level = "deny", priority = -1 }
-
-# Allow "fuzzing" as a "cfg" condition name
-# https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }

src/uu/seq/src/numberparse.rs

@@ -40,7 +40,7 @@ fn compute_num_digits(input: &str, ebd: ExtendedBigDecimal) -> PreciseNumber {
         return PreciseNumber {
             number: ebd,
             num_integral_digits: 0,
-            num_fractional_digits: if input.contains(".") || input.contains("p") {
+            num_fractional_digits: if input.contains('.') || input.contains('p') {
                 None
             } else {
                 Some(0)
@@ -49,17 +49,17 @@ fn compute_num_digits(input: &str, ebd: ExtendedBigDecimal) -> PreciseNumber {
     }
 
     // Split the exponent part, if any
-    let parts: Vec<&str> = input.split("e").collect();
+    let parts: Vec<&str> = input.split('e').collect();
     debug_assert!(parts.len() <= 2);
 
     // Count all the digits up to `.`, `-` sign is included.
-    let (mut int_digits, mut frac_digits) = match parts[0].find(".") {
+    let (mut int_digits, mut frac_digits) = match parts[0].find('.') {
         Some(i) => {
             // Cover special case .X and -.X where we behave as if there was a leading 0:
             // 0.X, -0.X.
             let int_digits = match i {
                 0 => 1,
-                1 if parts[0].starts_with("-") => 2,
+                1 if parts[0].starts_with('-') => 2,
                 _ => i,
             };
 
@@ -75,7 +75,7 @@ fn compute_num_digits(input: &str, ebd: ExtendedBigDecimal) -> PreciseNumber {
         // For positive exponents, effectively expand the number. Ignore negative exponents.
         // Also ignore overflowed exponents (unwrap_or(0)).
         if exp > 0 {
-            int_digits += exp.try_into().unwrap_or(0)
+            int_digits += exp.try_into().unwrap_or(0);
         };
         frac_digits = if exp < frac_digits as i64 {
             // Subtract from i128 to avoid any overflow
@@ -106,7 +106,7 @@ impl FromStr for PreciseNumber {
                     ebd
                 }
                 ExtendedBigDecimal::Infinity | ExtendedBigDecimal::MinusInfinity => {
-                    return Ok(PreciseNumber {
+                    return Ok(Self {
                         number: ebd,
                         num_integral_digits: 0,
                         num_fractional_digits: Some(0),

src/uu/seq/src/seq.rs

@@ -106,10 +106,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let options = SeqOptions {
         separator: matches
             .get_one::<OsString>(OPT_SEPARATOR)
-            .map_or(OsString::from("\n"), |s| s.to_os_string()),
+            .cloned()
+            .unwrap_or_else(|| OsString::from("\n")),
         terminator: matches
             .get_one::<OsString>(OPT_TERMINATOR)
-            .map_or(OsString::from("\n"), |s| s.to_os_string()),
+            .cloned()
+            .unwrap_or_else(|| OsString::from("\n")),
         equal_width: matches.get_flag(OPT_EQUAL_WIDTH),
         format: matches.get_one::<String>(OPT_FORMAT).map(|s| s.as_str()),
     };