Merge pull request #683 from matthiasbeyer/rewrite-storeid-type-imag-link-cleanup

imag-link cleanup

imag-link/Cargo.toml

@@ -23,3 +23,6 @@ path = "../libimagentrylink"
 [dependencies.libimagerror]
 path = "../libimagerror"
 
+[dependencies.libimagutil]
+path = "../libimagutil"
+

imag-link/src/main.rs

@@ -24,6 +24,7 @@ extern crate libimagentrylink;
 extern crate libimagrt;
 extern crate libimagstore;
 extern crate libimagerror;
+extern crate libimagutil;
 
 use std::process::exit;
 use std::ops::Deref;
@@ -36,6 +37,7 @@ use libimagstore::store::FileLockEntry;
 use libimagstore::store::Store;
 use libimagerror::trace::{trace_error, trace_error_exit};
 use libimagentrylink::external::ExternalLinker;
+use libimagutil::warn_result::*;
 use clap::ArgMatches;
 use url::Url;
 
@@ -77,7 +79,16 @@ fn handle_internal_linking(rt: &Runtime) {
                 Ok(Some(e)) => {
                     e.get_internal_links()
                         .map(|links| {
-                            for (i, link) in links.iter().map(|l| l.to_str().ok()).filter_map(|x| x).enumerate() {
+                            let i = links
+                                .iter()
+                                .filter_map(|l| {
+                                    l.to_str()
+                                        .map_warn_err(|e| format!("Failed to convert StoreId to string: {:?}", e))
+                                        .ok()
+                                })
+                                .enumerate();
+
+                            for (i, link) in i {
                                 println!("{: <3}: {}", i, link);
                             }
                         })

libimagutil/src/lib.rs

@@ -24,3 +24,4 @@ pub mod ismatch;
 pub mod iter;
 pub mod key_value_split;
 pub mod variants;
+pub mod warn_result;

libimagutil/src/warn_result.rs

@@ -0,0 +1,9 @@
+generate_result_logging_extension!(
+    WarnResult,
+    map_warn,
+    map_warn_str,
+    map_warn_err,
+    map_warn_err_str,
+    |s| { warn!("{}", s); }
+);
+