From 39f8329222acf64ff9d5a3193cd8608b46c1f4f4 Mon Sep 17 00:00:00 2001 From: Sam Caldwell Date: Tue, 1 Feb 2022 14:13:52 -0700 Subject: [PATCH] truncate: use `map_err` instead of `unwrap_or_else` --- src/uu/truncate/src/truncate.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/uu/truncate/src/truncate.rs b/src/uu/truncate/src/truncate.rs index 12f413247..242dd416a 100644 --- a/src/uu/truncate/src/truncate.rs +++ b/src/uu/truncate/src/truncate.rs @@ -116,15 +116,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { .override_usage(&usage[..]) .after_help(&long_usage[..]) .try_get_matches_from(args) - .unwrap_or_else(|e| { + .map_err(|e| { e.print().expect("Error writing clap::Error"); match e.kind { - clap::ErrorKind::DisplayHelp | clap::ErrorKind::DisplayVersion => { - std::process::exit(0) - } - _ => std::process::exit(1), + clap::ErrorKind::DisplayHelp | clap::ErrorKind::DisplayVersion => 0, + _ => 1, } - }); + })?; let files: Vec = matches .values_of(options::ARG_FILES)