From 751ce5af1a515594f96bcbe6ad744a05e85f2680 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 5 Feb 2019 01:10:46 +0100
Subject: Simplify implementation

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 lib/core/libimagrt/src/logger.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'lib/core/libimagrt')

diff --git a/lib/core/libimagrt/src/logger.rs b/lib/core/libimagrt/src/logger.rs
index cf4f975e..e9526a35 100644
--- a/lib/core/libimagrt/src/logger.rs
+++ b/lib/core/libimagrt/src/logger.rs
@@ -263,18 +263,14 @@ fn translate_destination(raw: &str) -> Result<LogDestination> {
 
 fn translate_destinations(raw: &Vec<Value>) -> Result<Vec<LogDestination>> {
     raw.iter()
-        .fold(Ok(vec![]), |acc, val| {
-            acc.and_then(|mut v| {
-                let dest = val.as_str()
-                    .ok_or_else(|| {
-                        let msg = "Type error at 'imag.logging.modules.<mod>.destinations', expected Array<String>";
-                        Error::from(err_msg(msg))
-                    })
-                    .and_then(translate_destination)?;
-                v.push(dest);
-                Ok(v)
-            })
+        .map(|val| {
+            val.as_str()
+                .ok_or_else(|| "Type error at 'imag.logging.modules.<mod>.destinations', expected Array<String>")
+                .map_err(err_msg)
+                .map_err(Error::from)
+                .and_then(|s| translate_destination(s))
         })
+        .collect()
 }
 
 fn aggregate_global_destinations(matches: &ArgMatches, config: Option<&Value>)
-- 
cgit v1.2.3