hatter/rust_util
1
0
Fork 0
mirror of https://github.com/jht5945/rust_util.git synced 2025-12-27 15:40:03 +08:00
Code Issues Releases Wiki Activity

feat: use XResult<()>

Browse Source
This commit is contained in:
Hatter Jiang
2021-01-03 01:30:10 +08:00
parent 249d7ee36e
commit 5df135fda9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/util_clap.rs
View File

@@ -48,7 +48,7 @@ impl CommandExecutor {
self self
} }
pub fn run(&self) -> CommandError { pub fn run(&self) -> XResult<()> {
let mut app = App::new(env!("CARGO_PKG_NAME")) let mut app = App::new(env!("CARGO_PKG_NAME"))
.version(env!("CARGO_PKG_VERSION")) .version(env!("CARGO_PKG_VERSION"))
.about(env!("CARGO_PKG_DESCRIPTION")); .about(env!("CARGO_PKG_DESCRIPTION"));
@@ -62,7 +62,7 @@ impl CommandExecutor {
for command in &self.commands { for command in &self.commands {
if let Some(sub_cmd_matches) = matches.subcommand_matches(command.name()) { if let Some(sub_cmd_matches) = matches.subcommand_matches(command.name()) {
match command.run(&matches, sub_cmd_matches)? { match command.run(&matches, sub_cmd_matches)? {
None => return Ok(None), None => return Ok(()),
Some(code) => process::exit(code), Some(code) => process::exit(code),
} }
} }
@@ -73,7 +73,7 @@ impl CommandExecutor {
process::exit(1); process::exit(1);
}, },
Some(default_cmd) => match default_cmd.run(&matches)? { Some(default_cmd) => match default_cmd.run(&matches)? {
None => return Ok(None), None => return Ok(()),
Some(code) => process::exit(code), Some(code) => process::exit(code),
}, },
} }