From 4d40555cd58dbd82f908cbd20ea57d617fe6e7b3 Mon Sep 17 00:00:00 2001 From: Alexandre Hausen Date: Wed, 8 Nov 2023 20:32:03 -0300 Subject: [PATCH] fixup! du: remove crash! macro --- src/uu/du/src/du.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index ddfbc5cc4..3a8ac4b14 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -255,13 +255,8 @@ fn get_file_info(path: &Path) -> Option { fn read_block_size(s: Option<&str>) -> UResult { if let Some(s) = s { - match parse_size_u64(s) { - Ok(x) => Ok(x), - Err(e) => Err(USimpleError::new( - 1, - format_error_message(&e, s, options::BLOCK_SIZE), - )), - } + parse_size_u64(s) + .map_err(|e| USimpleError::new(1, format_error_message(&e, s, options::BLOCK_SIZE))) } else { for env_var in ["DU_BLOCK_SIZE", "BLOCK_SIZE", "BLOCKSIZE"] { if let Ok(env_size) = env::var(env_var) {