From aaf4a353c362d2986e4bf7b4cb7ecfe332baf094 Mon Sep 17 00:00:00 2001 From: oech3 <79379754+oech3@users.noreply.github.com> Date: Thu, 28 May 2026 01:51:28 +0900 Subject: [PATCH] tee: simplify code --- src/uu/tee/src/tee.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs index 0e75e995f..8f96f4cc7 100644 --- a/src/uu/tee/src/tee.rs +++ b/src/uu/tee/src/tee.rs @@ -206,17 +206,12 @@ impl MultiWriter { false } }); - self.aborted.take().map_or( - if self.writers.is_empty() { - // This error kind will never be raised by the standard - // library, so we can use it for early termination of - // `copy` - Err(Error::from(ErrorKind::Other)) - } else { - Ok(()) - }, - Err, - ) + match self.aborted.take() { + Some(e) => Err(e), + // This error kind will never be raised by std, so we can use it for termination when all writers exited + None if self.writers.is_empty() => Err(Error::from(ErrorKind::Other)), + None => Ok(()), + } } }