Remove usage of '.init'

Author: dehesa

sources/Utils.swift

@@ -68,7 +68,7 @@ extension Array where Element:Hashable {
   /// In case of two array element with the same hash value, the closure is executed and the generated error is thrown.
   /// - parameter error: The error being thrown on hash value collisions.
   func lookupDictionary(onCollision error: ()->Swift.Error) throws -> [Int:Int] {
-    var lookup: [Int:Int] = .init(minimumCapacity: self.count)
+    var lookup: [Int:Int] = Dictionary(minimumCapacity: self.count)
     for (index, header) in self.enumerated() {
       let hash = header.hashValue
       guard case .none = lookup.updateValue(index, forKey: hash) else { throw error() }

sources/declarative/decodable/Decoder.swift

@@ -9,9 +9,9 @@ import Foundation
 
   /// Creates a CSV decoder with tthe default configuration values.
   /// - parameter configuration: Configuration values for the decoding process.
-  public init(configuration: Configuration = .init()) {
+  public init(configuration: Configuration = Configuration()) {
     self._configuration = configuration
-    self.userInfo = .init()
+    self.userInfo = Dictionary()
   }
 
   /// Creates a CSV decoder and passes the default configuration values to the closure.

sources/declarative/decodable/DecoderConfiguration.swift

@@ -22,7 +22,7 @@ extension CSVDecoder {
 
     /// Designated initializer setting the default values.
     public init() {
-      self.readerConfiguration = .init()
+      self.readerConfiguration = CSVReader.Configuration()
       self.nilStrategy = .empty
       self.boolStrategy = .insensitive
       self.nonConformingFloatStrategy = .throw

sources/declarative/decodable/DecoderLazy.swift

@@ -77,8 +77,8 @@ extension CSVDecoder.Lazy {
 fileprivate extension CSVDecoder.Error {
   /// Error raised when the end of the file has been reached unexpectedly.
   static func _unexpectedEnd() -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "There are no more rows to decode. The file is at the end.",
-          help: "Use next() or decodeIfPresent(_:) instead of decode(_:) if you are unsure where the file ends.")
+    CSVError(.invalidPath,
+             reason: "There are no more rows to decode. The file is at the end.",
+             help: "Use next() or decodeIfPresent(_:) instead of decode(_:) if you are unsure where the file ends.")
   }
 }

sources/declarative/decodable/containers/KeyedDecodingContainer.swift

@@ -199,65 +199,65 @@ extension ShadowDecoder.KeyedContainer {
 }
 
 //extension ShadowDecoder.KeyedContainer {
-//    func decodeIfPresent(_ type: String.Type, forKey key: Key) throws -> String? {
-//        try? self.decode(String.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: String.Type, forKey key: Key) throws -> String? {
+//    try? self.decode(String.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Bool.Type, forKey key: Key) throws -> Bool? {
-//        try? self.decode(Bool.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Bool.Type, forKey key: Key) throws -> Bool? {
+//    try? self.decode(Bool.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Int.Type, forKey key: Key) throws -> Int? {
-//        try? self.decode(Int.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Int.Type, forKey key: Key) throws -> Int? {
+//    try? self.decode(Int.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Int8.Type, forKey key: Key) throws -> Int8? {
-//        try? self.decode(Int8.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Int8.Type, forKey key: Key) throws -> Int8? {
+//    try? self.decode(Int8.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Int16.Type, forKey key: Key) throws -> Int16? {
-//        try? self.decode(Int16.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Int16.Type, forKey key: Key) throws -> Int16? {
+//    try? self.decode(Int16.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Int32.Type, forKey key: Key) throws -> Int32? {
-//        try? self.decode(Int32.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Int32.Type, forKey key: Key) throws -> Int32? {
+//    try? self.decode(Int32.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Int64.Type, forKey key: Key) throws -> Int64? {
-//        try? self.decode(Int64.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Int64.Type, forKey key: Key) throws -> Int64? {
+//    try? self.decode(Int64.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: UInt.Type, forKey key: Key) throws -> UInt? {
-//        try? self.decode(UInt.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: UInt.Type, forKey key: Key) throws -> UInt? {
+//    try? self.decode(UInt.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: UInt8.Type, forKey key: Key) throws -> UInt8? {
-//        try? self.decode(UInt8.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: UInt8.Type, forKey key: Key) throws -> UInt8? {
+//    try? self.decode(UInt8.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: UInt16.Type, forKey key: Key) throws -> UInt16? {
-//        try? self.decode(UInt16.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: UInt16.Type, forKey key: Key) throws -> UInt16? {
+//    try? self.decode(UInt16.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: UInt32.Type, forKey key: Key) throws -> UInt32? {
-//        try? self.decode(UInt32.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: UInt32.Type, forKey key: Key) throws -> UInt32? {
+//    try? self.decode(UInt32.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: UInt64.Type, forKey key: Key) throws -> UInt64? {
-//        try? self.decode(UInt64.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: UInt64.Type, forKey key: Key) throws -> UInt64? {
+//    try? self.decode(UInt64.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Float.Type, forKey key: Key) throws -> Float? {
-//        try? self.decode(Float.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Float.Type, forKey key: Key) throws -> Float? {
+//    try? self.decode(Float.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent(_ type: Double.Type, forKey key: Key) throws -> Double? {
-//        try? self.decode(Double.self, forKey: key)
-//    }
+//  func decodeIfPresent(_ type: Double.Type, forKey key: Key) throws -> Double? {
+//    try? self.decode(Double.self, forKey: key)
+//  }
 //
-//    func decodeIfPresent<T>(_ type: T.Type, forKey key: Key) throws -> T? where T:Decodable {
-//        try? self.decode(T.self, forKey: key)
-//    }
+//  func decodeIfPresent<T>(_ type: T.Type, forKey key: Key) throws -> T? where T:Decodable {
+//    try? self.decode(T.self, forKey: key)
+//  }
 //}
 
 // MARK: -
@@ -291,33 +291,33 @@ private extension ShadowDecoder.KeyedContainer {
     }
 
     let decoder = ShadowDecoder(source: self._decoder.source, codingPath: codingPath)
-    return .init(unsafeDecoder: decoder, rowIndex: index.row, fieldIndex: index.field)
+    return ShadowDecoder.SingleValueContainer(unsafeDecoder: decoder, rowIndex: index.row, fieldIndex: index.field)
   }
 }
 
 fileprivate extension CSVDecoder.Error {
   /// Error raised when a coding key representing a row within the CSV file cannot be transformed into an integer value.
   /// - parameter codingPath: The full decoding chain.
   static func _invalidRowKey(forKey key: CodingKey, codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "The coding key identifying a CSV row couldn't be transformed into an integer value.",
-          help: "The provided coding key identifying a CSV row must implement `intValue`.",
-          userInfo: ["Coding path": codingPath, "Key": key])
+    CSVError(.invalidPath,
+             reason: "The coding key identifying a CSV row couldn't be transformed into an integer value.",
+             help: "The provided coding key identifying a CSV row must implement `intValue`.",
+             userInfo: ["Coding path": codingPath, "Key": key])
   }
   /// Error raised when a keyed container is requested on an invalid coding path.
   /// - parameter codingPath: The full decoding chain.
   static func _invalidContainerRequest(forKey key: CodingKey, codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "A CSV doesn't support more than two nested decoding container.",
-          help: "Don't ask for a nested container on the targeted key for this coding path.",
-          userInfo: ["Coding path": codingPath, "Key": key])
+    CSVError(.invalidPath,
+             reason: "A CSV doesn't support more than two nested decoding container.",
+             help: "Don't ask for a nested container on the targeted key for this coding path.",
+             userInfo: ["Coding path": codingPath, "Key": key])
   }
   /// Error raised when a value is decoded, but a container was expected by the decoder.
   /// - parameter codingPath: The full decoding chain.
   static func _invalidNestedRequired(codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "A nested container is needed to decode CSV row values",
-          help: "Request a nested container instead of trying to decode a value directly.",
-          userInfo: ["Coding path": codingPath])
+    CSVError(.invalidPath,
+             reason: "A nested container is needed to decode CSV row values",
+             help: "Request a nested container instead of trying to decode a value directly.",
+             userInfo: ["Coding path": codingPath])
   }
 }

sources/declarative/decodable/containers/SingleValueDecodingContainer.swift

@@ -280,25 +280,25 @@ fileprivate extension CSVDecoder.Error {
   /// Error raised when a coding key representing a row within the CSV file cannot be transformed into an integer value.
   /// - parameter codingPath: The whole coding path, including the invalid row key.
   static func _invalidRowKey(forKey key: CodingKey, codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "The coding key identifying a CSV row couldn't be transformed into an integer value.",
-          help: "The provided coding key identifying a CSV row must implement `intValue`.",
-          userInfo: ["Coding path": codingPath, "Key": key])
+    CSVError(.invalidPath,
+             reason: "The coding key identifying a CSV row couldn't be transformed into an integer value.",
+             help: "The provided coding key identifying a CSV row must implement `intValue`.",
+             userInfo: ["Coding path": codingPath, "Key": key])
   }
   /// Error raised when a single value container is requested on an invalid coding path.
   /// - parameter codingPath: The full chain of containers which generated this error.
   static func _invalidContainerRequest(codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "A CSV doesn't support more than two nested decoding containers.",
-          help: "Don't ask for a single value encoding container on this coding path.",
-          userInfo: ["Coding path": codingPath])
+    CSVError(.invalidPath,
+             reason: "A CSV doesn't support more than two nested decoding containers.",
+             help: "Don't ask for a single value encoding container on this coding path.",
+             userInfo: ["Coding path": codingPath])
   }
   /// Error raised when a value is decoded, but a container was expected by the decoder.
   static func _invalidNestedRequired(codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "A nested container is needed to decode CSV row values",
-          help: "Request a nested container instead of trying to decode the value directly.",
-          userInfo: ["Coding path": codingPath])
+    CSVError(.invalidPath,
+             reason: "A nested container is needed to decode CSV row values",
+             help: "Request a nested container instead of trying to decode the value directly.",
+             userInfo: ["Coding path": codingPath])
   }
   /// Error raised when transforming a `String` value into another type.
   /// - parameter value: The `String` value, which couldn't be transformed.

sources/declarative/decodable/containers/UnkeyedDecodingContainer.swift

@@ -244,32 +244,32 @@ private extension ShadowDecoder.UnkeyedContainer {
     }
 
     let decoder = ShadowDecoder(source: self._decoder.source, codingPath: codingPath)
-    return .init(unsafeDecoder: decoder, rowIndex: index.row, fieldIndex: index.field)
+    return ShadowDecoder.SingleValueContainer(unsafeDecoder: decoder, rowIndex: index.row, fieldIndex: index.field)
   }
 }
 
 fileprivate extension CSVDecoder.Error {
   /// Error raised when a coding key representing a row within the CSV file cannot be transformed into an integer value.
   /// - parameter codingPath: The whole coding path, including the invalid row key.
   static func _invalidRowKey(forKey key: CodingKey, codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "The coding key identifying a CSV row couldn't be transformed into an integer value.",
-          help: "The provided coding key identifying a CSV row must implement `intValue`.",
-          userInfo: ["Coding path": codingPath, "Key": key])
+    CSVError(.invalidPath,
+             reason: "The coding key identifying a CSV row couldn't be transformed into an integer value.",
+             help: "The provided coding key identifying a CSV row must implement `intValue`.",
+             userInfo: ["Coding path": codingPath, "Key": key])
   }
   /// Error raised when a unkeyed container is requested on an invalid coding path.
   /// - parameter codingPath: The full chain of containers which generated this error.
   static func _invalidContainerRequest(codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "A CSV doesn't support more than two nested encoding container.",
-          help: "Don't ask for a unkeyed decoding container on this coding path.",
-          userInfo: ["Coding path": codingPath])
+    CSVError(.invalidPath,
+             reason: "A CSV doesn't support more than two nested encoding container.",
+             help: "Don't ask for a unkeyed decoding container on this coding path.",
+             userInfo: ["Coding path": codingPath])
   }
   /// Error raised when a value is decoded, but a container was expected by the decoder.
   static func _invalidNestedRequired(codingPath: [CodingKey]) -> CSVError<CSVDecoder> {
-    .init(.invalidPath,
-          reason: "A nested container is needed to decode at this coding path.",
-          help: "Request a nested container instead of trying to decode a value directly.",
-          userInfo: ["Coding path": codingPath])
+    CSVError(.invalidPath,
+             reason: "A nested container is needed to decode at this coding path.",
+             help: "Request a nested container instead of trying to decode a value directly.",
+             userInfo: ["Coding path": codingPath])
   }
 }