Merge pull request #7703 from nyurik/lints

feat: minor linting

src/uu/csplit/src/split_name.rs

@@ -47,10 +47,7 @@ impl SplitName {
             .transpose()?
             .unwrap_or(2);
 
-        let format_string = match format_opt {
+        let format_string = format_opt.unwrap_or_else(|| format!("%0{n_digits}u"));
-            Some(f) => f,
-            None => format!("%0{n_digits}u"),
-        };
 
         let format = match Format::<UnsignedInt, u64>::parse(format_string) {
             Ok(format) => Ok(format),

src/uu/cut/src/searcher.rs

@@ -61,7 +61,7 @@ mod exact_searcher_tests {
         let matcher = ExactMatcher::new("a".as_bytes());
         let iter = Searcher::new(&matcher, "".as_bytes());
         let items: Vec<(usize, usize)> = iter.collect();
-        assert_eq!(vec![] as Vec<(usize, usize)>, items);
+        assert!(items.is_empty());
     }
 
     fn test_multibyte(line: &[u8], expected: &[(usize, usize)]) {
@@ -140,7 +140,7 @@ mod whitespace_searcher_tests {
         let matcher = WhitespaceMatcher {};
         let iter = Searcher::new(&matcher, "".as_bytes());
         let items: Vec<(usize, usize)> = iter.collect();
-        assert_eq!(vec![] as Vec<(usize, usize)>, items);
+        assert!(items.is_empty());
     }
 
     fn test_multispace(line: &[u8], expected: &[(usize, usize)]) {

src/uu/dd/src/parseargs.rs

@@ -442,7 +442,7 @@ fn parse_bytes_only(s: &str, i: usize) -> Result<u64, ParseError> {
 /// 512. You can also use standard block size suffixes like `'k'` for
 /// 1024.
 ///
-/// If the number would be too large, return [`std::u64::MAX`] instead.
+/// If the number would be too large, return [`u64::MAX`] instead.
 ///
 /// # Errors
 ///

src/uu/install/src/install.rs

@@ -124,10 +124,7 @@ pub enum MainFunction {
 impl Behavior {
     /// Determine the mode for chmod after copy.
     pub fn mode(&self) -> u32 {
-        match self.specified_mode {
+        self.specified_mode.unwrap_or(DEFAULT_MODE)
-            Some(x) => x,
-            None => DEFAULT_MODE,
-        }
     }
 }
 

src/uu/ls/src/colors.rs

@@ -104,11 +104,11 @@ impl<'a> StyleManager<'a> {
         ret
     }
 
-    pub(crate) fn is_current_style(&mut self, new_style: &Style) -> bool {
+    pub(crate) fn is_current_style(&self, new_style: &Style) -> bool {
         matches!(&self.current_style, Some(style) if style == new_style)
     }
 
-    pub(crate) fn is_reset(&mut self) -> bool {
+    pub(crate) fn is_reset(&self) -> bool {
         self.current_style.is_none()
     }
 

src/uu/od/src/prn_float.rs

@@ -3,8 +3,6 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 use half::f16;
-use std::f32;
-use std::f64;
 use std::num::FpCategory;
 
 use crate::formatteriteminfo::{FormatWriter, FormatterItemInfo};

src/uucore/src/lib/features/checksum.rs

@@ -535,7 +535,7 @@ impl LineFormat {
 
             let mut parts = checksum.splitn(2, |&b| b == b'=');
             let main = parts.next().unwrap(); // Always exists since checksum isn't empty
-            let padding = parts.next().unwrap_or(&b""[..]); // Empty if no '='
+            let padding = parts.next().unwrap_or_default(); // Empty if no '='
 
             main.iter()
                 .all(|&b| b.is_ascii_alphanumeric() || b == b'+' || b == b'/')

src/uucore/src/lib/features/format/num_format.rs

@@ -1123,7 +1123,7 @@ mod test {
         U: Formatter<T>,
     {
         let mut v = Vec::<u8>::new();
-        format.fmt(&mut v, n as T).unwrap();
+        format.fmt(&mut v, n).unwrap();
         String::from_utf8_lossy(&v).to_string()
     }