From 23f5f55560a493b2de6287451e07ede8ba5aa367 Mon Sep 17 00:00:00 2001 From: 353fc443 <353fc443@pm.me> Date: Fri, 2 Jul 2021 12:14:24 +0000 Subject: [PATCH] Added UResult for dirname --- src/uu/dirname/src/dirname.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index 356f2e6b1..797e51808 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -10,6 +10,7 @@ extern crate uucore; use clap::{crate_version, App, Arg}; use std::path::Path; +use uucore::error::{UResult, USimpleError}; use uucore::InvalidEncodingHandling; static ABOUT: &str = "strip last component from file name"; @@ -30,7 +31,8 @@ fn get_long_usage() -> String { ) } -pub fn uumain(args: impl uucore::Args) -> i32 { +#[uucore_procs::gen_uumain] +pub fn uumain(args: impl uucore::Args) -> UResult<()> { let args = args .collect_str(InvalidEncodingHandling::ConvertLossy) .accept_any(); @@ -77,11 +79,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 { print!("{}", separator); } } else { - show_usage_error!("missing operand"); - return 1; + return Err(USimpleError::new(1, format!("missing operand"))); } - 0 + Ok(()) } pub fn uu_app() -> App<'static, 'static> {