Remove underscores from switch case, and use do-catch pattern matching for slightly cleaner code

Author: Kevin Lundberg

Sources/Unboxer.swift

@@ -244,26 +244,22 @@ private extension Unboxer {
 
                 throw UnboxPathError.emptyKeyPath
             }
-        } catch {
-            if case UnboxError.pathError(let pathError, let partialPath) = error {
-                switch pathError {
-                case .emptyKeyPath,
-                     .invalidCollectionElementType(_),
-                     .invalidDictionaryKey(_):
-                    throw UnboxError.pathError(pathError, partialPath)
-                case .missingKey(_),
-                     .invalidValue(_, _, _),
-                     .invalidDictionaryKeyType(_),
-                     .invalidDictionaryValue(_, _, _):
-                    throw UnboxError.pathError(pathError, "\(path).\(partialPath)")
-                case let .invalidArrayElement(_, index, _):
-                    throw UnboxError.pathError(pathError, "\(path).\(index).\(partialPath)")
-                }
-            } else if let pathError = error as? UnboxPathError {
-                throw UnboxError.pathError(pathError, path.description)
+        } catch UnboxError.pathError(let pathError, let partialPath) {
+            switch pathError {
+            case .emptyKeyPath,
+                 .invalidCollectionElementType,
+                 .invalidDictionaryKey:
+                throw UnboxError.pathError(pathError, partialPath)
+            case .missingKey,
+                 .invalidValue,
+                 .invalidDictionaryKeyType,
+                 .invalidDictionaryValue:
+                throw UnboxError.pathError(pathError, "\(path).\(partialPath)")
+            case let .invalidArrayElement(_, index, _):
+                throw UnboxError.pathError(pathError, "\(path).\(index).\(partialPath)")
             }
-
-            throw error
+        } catch let pathError as UnboxPathError {
+            throw UnboxError.pathError(pathError, path.description)
         }
     }
 

Tests/UnboxTests/UnboxTests.swift

@@ -1635,7 +1635,7 @@ class UnboxTests: XCTestCase {
             _ = try unbox(dictionary: dictionary) as Model
             XCTFail("Should have thrown")
         } catch {
-            XCTAssertEqual("\(error)", "[UnboxError] An error occurred while unboxing path \"array\": Invalid array element ([:]) at index 0.")
+            XCTAssertEqual("\(error)", "[UnboxError] An error occurred while unboxing path \"array\": Invalid array element ([:]) at index 0, JSON type Dictionary<AnyHashable, Any> cannot be unboxed as String")
         }
     }