From 6b0930adec009c1e7dde4e7558c602a286c5a8dd Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 12 Feb 2018 21:25:33 +0100
Subject: [PATCH] Use ErrFromStr convenience extension

---
 bin/core/imag-view/src/main.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/core/imag-view/src/main.rs b/bin/core/imag-view/src/main.rs
index ce729c51..ea55c9a7 100644
--- a/bin/core/imag-view/src/main.rs
+++ b/bin/core/imag-view/src/main.rs
@@ -44,7 +44,6 @@ extern crate libimagerror;
 extern crate libimagrt;
 extern crate libimagstore;
 
-use std::error::Error;
 use std::collections::BTreeMap;
 use std::io::Write;
 use std::path::PathBuf;
@@ -55,6 +54,7 @@ use handlebars::Handlebars;
 use toml_query::read::TomlValueReadTypeExt;
 
 use libimagrt::setup::generate_runtime_setup;
+use libimagerror::str::ErrFromStr;
 use libimagerror::trace::MapErrTrace;
 use libimagentryview::builtin::stdout::StdoutViewer;
 use libimagentryview::viewer::Viewer;
@@ -108,29 +108,29 @@ fn main() {
 
         let _ = handlebars
             .register_template_string("template", viewer_template)
-            .map_err(|e| format!("{}", e.description()))
+            .err_from_str()
             .map_err(VE::from)
             .map_err_trace_exit_unwrap(1);
 
         let file = {
             let mut tmpfile = tempfile::NamedTempFile::new()
-            .map_err(|e| format!("{}", e.description()))
+            .err_from_str()
             .map_err(VE::from)
                 .map_err_trace_exit_unwrap(1);
             if view_header {
                 let hdr = toml::ser::to_string_pretty(entry.get_header())
-                    .map_err(|e| format!("{}", e.description()))
+                    .err_from_str()
                     .map_err(VE::from)
                     .map_err_trace_exit_unwrap(1);
                 let _ = tmpfile.write(format!("---\n{}---\n", hdr).as_bytes())
-                    .map_err(|e| format!("{}", e.description()))
+                    .err_from_str()
                     .map_err(VE::from)
                     .map_err_trace_exit_unwrap(1);
             }
 
             if !hide_content {
                 let _ = tmpfile.write(entry.get_content().as_bytes())
-                    .map_err(|e| format!("{}", e.description()))
+                    .err_from_str()
                     .map_err(VE::from)
                     .map_err_trace_exit_unwrap(1);
             }
@@ -151,7 +151,7 @@ fn main() {
 
             let call = handlebars
                 .render("template", &data)
-                .map_err(|e| format!("{}", e.description()))
+                .err_from_str()
                 .map_err(VE::from)
                 .map_err_trace_exit_unwrap(1);
             let mut elems = call.split_whitespace();
@@ -170,7 +170,7 @@ fn main() {
 
         if !command
             .status()
-            .map_err(|e| format!("{}", e.description()))
+            .err_from_str()
             .map_err(VE::from)
             .map_err_trace_exit_unwrap(1)
             .success()