clippy: collapsible_match lint

https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_match

Author: xtqqczze

src/uu/cp/src/cp.rs

@@ -1134,10 +1134,8 @@ impl Options {
                 options::PRESERVE => {
                     attributes = attributes.union(&Attributes::parse_iter(val.into_iter())?);
                 }
-                options::NO_PRESERVE => {
-                    if !val.is_empty() {
-                        attributes = attributes.diff(&Attributes::parse_iter(val.into_iter())?);
-                    }
+                options::NO_PRESERVE if !val.is_empty() => {
+                    attributes = attributes.diff(&Attributes::parse_iter(val.into_iter())?);
                 }
                 _ => (),
             }

src/uu/date/src/format_modifiers.rs

@@ -379,11 +379,9 @@ fn apply_modifiers(value: &str, parsed: &ParsedSpec<'_>) -> Result<String, Forma
                 uppercase = true;
                 swap_case = false; // ^ overrides #
             }
-            '#' => {
-                if !uppercase {
-                    // Only apply # if ^ hasn't been set
-                    swap_case = true;
-                }
+            '#' if !uppercase => {
+                // Only apply # if ^ hasn't been set
+                swap_case = true;
             }
             '+' => {
                 force_sign = true;

src/uu/od/src/od.rs

@@ -132,38 +132,35 @@ impl OdOptions {
 
         let formats = parse_format_flags(args).map_err(|e| USimpleError::new(1, e))?;
 
-        let mut line_bytes = match matches.get_one::<String>(options::WIDTH) {
-            None => 16,
-            Some(s) => {
-                if matches.value_source(options::WIDTH) == Some(ValueSource::CommandLine) {
-                    let width_display = option_display_name(args, options::WIDTH, Some('w'));
-                    let parsed = parse_number_of_bytes(s).map_err(|e| {
-                        USimpleError::new(1, format_error_message(&e, s, &width_display))
-                    })?;
-                    if parsed == 0 {
-                        return Err(USimpleError::new(
-                            1,
-                            translate!(
-                                "od-error-invalid-argument",
-                                "option" => width_display.clone(),
-                                "value" => s.quote()
-                            ),
-                        ));
-                    }
-                    usize::try_from(parsed).map_err(|_| {
-                        USimpleError::new(
-                            1,
-                            translate!(
-                                "od-error-argument-too-large",
-                                "option" => width_display.clone(),
-                                "value" => s.quote()
-                            ),
-                        )
-                    })?
-                } else {
-                    16
-                }
+        let mut line_bytes = if let (Some(s), Some(ValueSource::CommandLine)) = (
+            matches.get_one::<String>(options::WIDTH),
+            matches.value_source(options::WIDTH),
+        ) {
+            let width_display = option_display_name(args, options::WIDTH, Some('w'));
+            let parsed = parse_number_of_bytes(s)
+                .map_err(|e| USimpleError::new(1, format_error_message(&e, s, &width_display)))?;
+            if parsed == 0 {
+                return Err(USimpleError::new(
+                    1,
+                    translate!(
+                        "od-error-invalid-argument",
+                        "option" => width_display.clone(),
+                        "value" => s.quote()
+                    ),
+                ));
             }
+            usize::try_from(parsed).map_err(|_| {
+                USimpleError::new(
+                    1,
+                    translate!(
+                        "od-error-argument-too-large",
+                        "option" => width_display.clone(),
+                        "value" => s.quote()
+                    ),
+                )
+            })?
+        } else {
+            16
         };
 
         let min_bytes = formats.iter().fold(1, |max, next| {

src/uu/tail/src/follow/watch.rs

@@ -439,7 +439,7 @@ impl Observer {
                     */
                 }
             }
-            EventKind::Modify(ModifyKind::Name(RenameMode::Both)) => {
+            EventKind::Modify(ModifyKind::Name(RenameMode::Both))
                 /*
                 NOTE: For `tail -f a`, keep tracking additions to b after `mv a b`
                 (gnu/tests/tail-2/descriptor-vs-rename.sh)
@@ -457,7 +457,7 @@ impl Observer {
                 TODO: [2022-05; jhscheer] add test for this bug
                 */
 
-                if self.follow_descriptor() {
+                if self.follow_descriptor() => {
                     let new_path = event.paths.last().unwrap();
                     paths.push(new_path.clone());
 
@@ -472,7 +472,6 @@ impl Observer {
                     let _ = self.watcher_rx.as_mut().unwrap().unwatch(event_path);
                     self.watcher_rx.as_mut().unwrap().watch_with_parent(new_path)?;
                 }
-            }
             _ => {}
         }
         Ok(paths)

src/uucore/src/lib/features/fs.rs

@@ -435,12 +435,11 @@ pub fn canonicalize<P: AsRef<Path>>(
                 }
                 result.pop();
             }
-            Err(e) => {
-                if miss_mode == MissingHandling::Existing
-                    || (miss_mode == MissingHandling::Normal && !parts.is_empty())
-                {
-                    return Err(e);
-                }
+            Err(e)
+                if (miss_mode == MissingHandling::Existing
+                    || (miss_mode == MissingHandling::Normal && !parts.is_empty())) =>
+            {
+                return Err(e);
             }
             _ => {}
         }