Refactor code to be more idomatic

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2018-11-07 11:52:31 +01:00
parent ecf4cead93
commit 8e1768b424

View file

@ -57,6 +57,7 @@ use libimagbookmark::link::Link as BookmarkLink;
use libimagerror::trace::{MapErrTrace, trace_error}; use libimagerror::trace::{MapErrTrace, trace_error};
use libimagerror::io::ToExitCode; use libimagerror::io::ToExitCode;
use libimagerror::exit::ExitUnwrap; use libimagerror::exit::ExitUnwrap;
use libimagutil::debug_result::DebugResult;
mod ui; mod ui;
@ -152,14 +153,16 @@ fn list(rt: &Runtime) {
.report_touched(collection.get_location()) .report_touched(collection.get_location())
.map_err_trace_exit_unwrap(1); .map_err_trace_exit_unwrap(1);
let links = collection.links(rt.store()).map_err_trace_exit_unwrap(1); collection
debug!("Listing..."); .links(rt.store())
for (i, link) in links.enumerate() { .map_dbg_str("Listing...")
match link { .map_err_trace_exit_unwrap(1)
.into_iter()
.enumerate()
.for_each(|(i, link)| match link {
Ok(link) => writeln!(rt.stdout(), "{: >3}: {}", i, link).to_exit_code().unwrap_or_exit(), Ok(link) => writeln!(rt.stdout(), "{: >3}: {}", i, link).to_exit_code().unwrap_or_exit(),
Err(e) => trace_error(&e) Err(e) => trace_error(&e)
} });
};
debug!("... ready with listing"); debug!("... ready with listing");
} }