matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Use ErrFromStr convenience extension

Browse source
This commit is contained in:
Matthias Beyer 2018-02-12 21:25:51 +01:00
parent 6b0930adec
commit 94cad804e1
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/domain/imag-contact/src/create.rs
View file

@ -18,7 +18,6 @@
//
use std::collections::BTreeMap;
use std::error::Error;
use std::process::exit;
use std::io::Write;
use std::io::stdout;
@ -33,6 +32,7 @@ use uuid::Uuid;
use libimagcontact::error::ContactError as CE;
use libimagrt::runtime::Runtime;
use libimagerror::str::ErrFromStr;
use libimagerror::trace::MapErrTrace;
use libimagerror::trace::trace_error;
use libimagutil::warn_result::WarnResult;
@ -90,7 +90,7 @@ pub fn create(rt: &Runtime) {
.create_new(true)
.open(fl.clone())
.map_warn_err_str("Cannot create/open destination File. Stopping.")
.map_err(|e| format!("{}", e.description()))
.err_from_str()
.map_err(CE::from)
.map_err_trace_exit_unwrap(1);
@ -112,7 +112,7 @@ pub fn create(rt: &Runtime) {
match ::toml::de::from_str(&template)
.map(parse_toml_into_vcard)
.map_err(|e| format!("{}", e.description()))
.err_from_str()
.map_err(CE::from)
{
Err(e) => {

10
bin/domain/imag-contact/src/main.rs
View file

@ -52,7 +52,6 @@ extern crate libimagentryedit;
use std::process::exit;
use std::path::PathBuf;
use std::error::Error;
use handlebars::Handlebars;
use clap::ArgMatches;
@ -62,6 +61,7 @@ use walkdir::WalkDir;
use libimagrt::runtime::Runtime;
use libimagrt::setup::generate_runtime_setup;
use libimagerror::str::ErrFromStr;
use libimagerror::trace::MapErrTrace;
use libimagcontact::store::ContactStore;
use libimagcontact::error::ContactError as CE;
@ -134,7 +134,7 @@ fn list(rt: &Runtime) {
let data = build_data_object_for_handlebars(i, hash, &vcard);
let s = list_format.render("format", &data)
.map_err(|e| format!("{}", e.description()))
.err_from_str()
.map_err(CE::from)
.map_err_trace_exit_unwrap(1);
println!("{}", s);
@ -159,7 +159,7 @@ fn import(rt: &Runtime) {
} else if path.is_dir() {
for entry in WalkDir::new(path).min_depth(1).into_iter() {
let entry = entry
.map_err(|e| format!("{}", e.description()))
.err_from_str()
.map_err(CE::from)
.map_err_trace_exit_unwrap(1);
if entry.file_type().is_file() {
@ -202,7 +202,7 @@ fn show(rt: &Runtime) {
let s = show_format
.render("format", &data)
.map_err(|e| format!("{}", e.description()))
.err_from_str()
.map_err(CE::from)
.map_err_trace_exit_unwrap(1);
println!("{}", s);
@ -225,7 +225,7 @@ fn get_contact_print_format(config_value_path: &'static str, rt: &Runtime, scmd:
let mut hb = Handlebars::new();
let _ = hb
.register_template_string("format", fmt)
.map_err(|e| format!("{}", e.description()))
.err_from_str()
.map_err(CE::from)
.map_err_trace_exit_unwrap(1);