use array implementation

JohnSundell · Feb 15, 2017 · e3a3927 · e3a3927
1 parent 2dfc6dd
commit e3a3927
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Sources/Unbox.swift b/Sources/Unbox.swift
@@ -459,13 +459,11 @@ extension Set: UnboxableCollection {
     public typealias UnboxValue = Element
 
     public static func unbox<T: UnboxCollectionElementTransformer>(value: Any, allowInvalidElements: Bool, transformer: T) throws -> Set? where T.UnboxedElement == UnboxValue {
-        guard let array = value as? [T.UnboxRawElement] else {
+        guard let array = try [UnboxValue].unbox(value: value, allowInvalidElements: allowInvalidElements, transformer: transformer) else {
             return nil
         }
-
-        return try Set(array.enumerated().map(allowInvalidElements: allowInvalidElements) { index, element in
-            try transformer.unbox(element: element, allowInvalidCollectionElements: allowInvalidElements).orThrow(UnboxPathError.invalidArrayElement(element, index))
-        })
+
+        return Set(array)
     }
 }