Unbox array with formatter uses a for-in loop rather than a mapping f…

…unction to return early when invalid values encountered when not allowed
hhunaid · Jul 1, 2016 · f813026 · f813026
1 parent d6c338e
commit f813026
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/Sources/Unbox.swift b/Sources/Unbox.swift
@@ -716,18 +716,17 @@ public class Unboxer {
             if allowInvalidElements {
                 return array.flatMap({ formatter.formatUnboxedValue($0) })
             } else {
-                var invalidElement = false
+                var formattedArray = [T]()
 
-                let mapping = array.flatMap({ (value) -> T? in
-                    if let formattedValue = formatter.formatUnboxedValue(value) {
-                        return formattedValue
+                for value in array {
+                    guard let formattedValue = formatter.formatUnboxedValue(value) else {
+                        return nil
                     }
 
-                    invalidElement = true
-                    return nil
-                })
+                    formattedArray.append(formattedValue)
+                }
 
-                return invalidElement ? nil : mapping
+                return formattedArray
             }
         })
     }