diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2017-09-04 23:02:45 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2017-09-04 23:02:45 +0200 |
| commit | c115215fa4d4e460b08dd7854a5c711a3e819c80 (patch) | |
| tree | 23a8be2e09100cefb7ed1577edb07af1b06ab5d6 /bin/domain/imag-mail | |
| parent | 13af22ac16717235043de25b67194992c0c3a846 (diff) | |
| parent | 6d1dab31179eb4414b45d9a94f453833ddc558ce (diff) | |
Merge branch 'master' into libimagerror/integration
This merge solved a _LOT_ of conflicts and was a rather complicated one,
as parts of the conflict-resolution involved rewriting of half the
stuff.
This merge commit fixes all the things so a `cargo check --all`
succeeds, but I did not yet check whether tests run without failure.
Diffstat (limited to 'bin/domain/imag-mail')
| -rw-r--r-- | bin/domain/imag-mail/Cargo.toml | 1 | ||||
| -rw-r--r-- | bin/domain/imag-mail/src/main.rs | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml index 606fdfed..b9b31787 100644 --- a/bin/domain/imag-mail/Cargo.toml +++ b/bin/domain/imag-mail/Cargo.toml @@ -17,5 +17,4 @@ version = "2.0.1" libimagrt = { version = "0.4.0", path = "../../../lib/core/libimagrt" } libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" } libimagmail = { version = "0.4.0", path = "../../../lib/domain/libimagmail" } -libimagentryref = { version = "0.4.0", path = "../../../lib/entry/libimagentryref" } libimagutil = { version = "0.4.0", path = "../../../lib/etc/libimagutil" } diff --git a/bin/domain/imag-mail/src/main.rs b/bin/domain/imag-mail/src/main.rs index 02c107c5..7987e281 100644 --- a/bin/domain/imag-mail/src/main.rs +++ b/bin/domain/imag-mail/src/main.rs @@ -25,11 +25,9 @@ extern crate libimagrt; extern crate libimagmail; extern crate libimagerror; extern crate libimagutil; -extern crate libimagentryref; use libimagerror::trace::{MapErrTrace, trace_error, trace_error_exit}; use libimagmail::mail::Mail; -use libimagentryref::reference::Ref; use libimagrt::runtime::Runtime; use libimagrt::setup::generate_runtime_setup; use libimagutil::info_result::*; @@ -74,11 +72,11 @@ fn list(rt: &Runtime) { let iter = match store.retrieve_for_module("ref") { Ok(iter) => iter.filter_map(|id| { - Ref::get(store, id) - .chain_err(|| MEK::RefHandlingError) - .and_then(|rf| Mail::from_ref(rf)) - .map_err_trace() - .ok() + match store.get(id).chain_err(|| MEK::RefHandlingError).map_err_trace() { + Ok(Some(fle)) => Mail::from_fle(fle).map_err_trace().ok(), + Ok(None) => None, + Err(e) => trace_error_exit(&e, 1), + } }), Err(e) => trace_error_exit(&e, 1), }; |