From 92bfaea3faf870abc78ebbcc6d3ca980b2ed48ce Mon Sep 17 00:00:00 2001 From: Dean Li Date: Tue, 29 Jun 2021 19:48:20 +0800 Subject: [PATCH] arch: use UResult --- src/uu/arch/src/arch.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/uu/arch/src/arch.rs b/src/uu/arch/src/arch.rs index 955e57389..0f15654cc 100644 --- a/src/uu/arch/src/arch.rs +++ b/src/uu/arch/src/arch.rs @@ -12,16 +12,18 @@ extern crate uucore; use platform_info::*; use clap::{crate_version, App}; +use uucore::error::{FromIo, UResult}; static ABOUT: &str = "Display machine architecture"; static SUMMARY: &str = "Determine architecture name for current machine."; -pub fn uumain(args: impl uucore::Args) -> i32 { +#[uucore_procs::gen_uumain] +pub fn uumain(args: impl uucore::Args) -> UResult<()> { uu_app().get_matches_from(args); - let uts = return_if_err!(1, PlatformInfo::new()); + let uts = PlatformInfo::new().map_err_context(|| "arch: ".to_string())?; println!("{}", uts.machine().trim()); - 0 + Ok(()) } pub fn uu_app() -> App<'static, 'static> {