From ee6e766c8ddcf2899a2b0051ad470f8a6fb545ad Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 3 Mar 2018 16:00:49 +0100 Subject: [PATCH] Use generate_runtime_setup() to create Runtime object --- bin/domain/imag-diary/src/main.rs | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/bin/domain/imag-diary/src/main.rs b/bin/domain/imag-diary/src/main.rs index dd487936..ccaf3ab8 100644 --- a/bin/domain/imag-diary/src/main.rs +++ b/bin/domain/imag-diary/src/main.rs @@ -47,12 +47,7 @@ extern crate libimagstore; extern crate libimagtimeui; extern crate libimagutil; -use std::io::Write; -use std::process::exit; - -use libimagerror::exit::ExitUnwrap; -use libimagerror::io::ToExitCode; -use libimagrt::runtime::Runtime; +use libimagrt::setup::generate_runtime_setup; mod create; mod delete; @@ -66,24 +61,14 @@ use create::create; use delete::delete; use edit::edit; use list::list; -use ui::build_ui; use view::view; fn main() { let version = make_imag_version!(); - let name = "imag-diary"; - let about = "Personal Diary/Diaries"; - let ui = build_ui(Runtime::get_default_cli_builder(name, &version, about)); - let rt = { - let rt = Runtime::new(ui); - if rt.is_ok() { - rt.unwrap() - } else { - let _ = writeln!(rt.stdout(), "Could not set up Runtime").to_exit_code().unwrap_or_exit(); - let _ = writeln!(rt.stdout(), "{:?}", rt.err().unwrap()).to_exit_code().unwrap_or_exit(); - exit(1); - } - }; + let rt = generate_runtime_setup("imag-diary", + &version, + "Personal Diary/Diaries", + ui::build_ui); rt.cli() .subcommand_name()