From f287a212a042bcc72afbc23e28d6b8d6e5a2cf24 Mon Sep 17 00:00:00 2001
From: oech3 <79379754+oech3@users.noreply.github.com>
Date: Fri, 17 Apr 2026 20:14:50 +0900
Subject: [PATCH] tee: remove collapsible_if

---
 src/uu/tee/src/tee.rs | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs
index fc0795cf62b..90e18748f7e 100644
--- a/src/uu/tee/src/tee.rs
+++ b/src/uu/tee/src/tee.rs
@@ -246,18 +246,13 @@ impl Write for MultiWriter {
         let mode = self.output_error_mode.clone();
         let mut errors = 0;
         self.writers.retain_mut(|writer| {
-            let result = writer.write_all(buf);
-            match result {
-                Err(f) => {
-                    if let Err(e) = process_error(mode.as_ref(), f, writer, &mut errors) {
-                        if aborted.is_none() {
-                            aborted = Some(e);
-                        }
-                    }
-                    false
-                }
-                _ => true,
-            }
+            writer
+                .write_all(buf)
+                .map_err(|f| {
+                    let _ = process_error(mode.as_ref(), f, writer, &mut errors)
+                        .map_err(|e| aborted.get_or_insert(e));
+                })
+                .is_ok()
         });
         self.ignored_errors += errors;
         if let Some(e) = aborted {
@@ -277,18 +272,13 @@ impl Write for MultiWriter {
         let mode = self.output_error_mode.clone();
         let mut errors = 0;
         self.writers.retain_mut(|writer| {
-            let result = writer.flush();
-            match result {
-                Err(f) => {
-                    if let Err(e) = process_error(mode.as_ref(), f, writer, &mut errors) {
-                        if aborted.is_none() {
-                            aborted = Some(e);
-                        }
-                    }
-                    false
-                }
-                _ => true,
-            }
+            writer
+                .flush()
+                .map_err(|f| {
+                    let _ = process_error(mode.as_ref(), f, writer, &mut errors)
+                        .map_err(|e| aborted.get_or_insert(e));
+                })
+                .is_ok()
         });
         self.ignored_errors += errors;
         if let Some(e) = aborted {