rebase leftovers

Author: patrickfreed

Sources/MongoSwift/BSON/BSONDecoder.swift

@@ -360,7 +360,12 @@ extension _BSONDecoder {
         case .binary:
             let binary = try self.unboxCustom(value) { $0.binaryValue }
             guard let data = binary.data.getBytes(at: 0, length: binary.data.writerIndex) else {
-                throw InternalError(message: "Cannot read \(binary.data.writerIndex) bytes from Binary.data")
+                throw DecodingError.dataCorrupted(
+                    DecodingError.Context(
+                        codingPath: self.codingPath,
+                        debugDescription: "Cannot read \(binary.data.writerIndex) bytes from Binary.data"
+                    )
+                )
             }
             return Data(data)
         case .base64:

Sources/MongoSwift/BSON/BSONDocument.swift

@@ -145,10 +145,10 @@ extension BSONDocument {
      * presence first.
      *
      * - Throws:
-     *   - `InternalError` if the new value is an `Int` and cannot be written to BSON.
+     *   - `MongoError.InternalError` if the new value is an `Int` and cannot be written to BSON.
      *   - `MongoError.LogicError` if the new value is a `BSONDecimal128` or `BSONObjectID` and is improperly formatted.
      *   - `MongoError.LogicError` if the new value is an `Array` and it contains a non-`BSONValue` element.
-     *   - `InternalError` if the underlying `bson_t` would exceed the maximum size by encoding this
+     *   - `MongoError.InternalError` if the underlying `bson_t` would exceed the maximum size by encoding this
      *     key-value pair.
      */
     internal mutating func setValue(for key: String, to newValue: BSON, checkForKey: Bool = true) throws {
@@ -210,7 +210,7 @@ extension BSONDocument {
     /// Retrieves the value associated with `for` as a `BSON?`, which can be nil if the key does not exist in the
     /// `BSONDocument`.
     ///
-    /// - Throws: `InternalError` if the BSON buffer is too small (< 5 bytes).
+    /// - Throws: `MongoError.InternalError` if the BSON buffer is too small (< 5 bytes).
     internal func getValue(for key: String) throws -> BSON? {
         guard let iter = BSONDocumentIterator(over: self) else {
             throw BSONDocument.BSONBufferTooSmallError

Sources/MongoSwift/BSON/BSONDocumentIterator.swift

@@ -102,7 +102,7 @@ public class BSONDocumentIterator: IteratorProtocol {
     /// Returns the current value (equivalent to the `currentValue` property) or throws on error.
     ///
     /// - Throws:
-    ///   - `InternalError` if the current value of this `BSONDocumentIterator` cannot be decoded to BSON.
+    ///   - `MongoError.InternalError` if the current value of this `BSONDocumentIterator` cannot be decoded to BSON.
     internal func safeCurrentValue() throws -> BSON {
         guard let bsonType = BSONDocumentIterator.bsonTypeMap[currentType] else {
             throw MongoError.InternalError(
@@ -177,7 +177,7 @@ public class BSONDocumentIterator: IteratorProtocol {
      * Overwrites the current value of this `BSONDocumentIterator` with the supplied value.
      *
      * - Throws:
-     *   - `InternalError` if the new value is an `Int` and cannot be written to BSON.
+     *   - `MongoError.InternalError` if the new value is an `Int` and cannot be written to BSON.
      *   - `MongoError.LogicError` if the new value is a `BSONDecimal128` or `BSONObjectID` and is improperly formatted.
      */
     internal func overwriteCurrentValue(with newValue: Overwritable) throws {

Sources/MongoSwift/BSON/BSONValue.swift

@@ -70,7 +70,7 @@ internal protocol BSONValue: Codable {
      *   - key: A `String`, the key under which to store the value.
      *
      * - Throws:
-     *   - `InternalError` if the `DocumentStorage` would exceed the maximum size by encoding this
+     *   - `MongoError.InternalError` if the `DocumentStorage` would exceed the maximum size by encoding this
      *     key-value pair.
      *   - `MongoError.LogicError` if the value is an `Array` and it contains a non-`BSONValue` element.
      */
@@ -240,18 +240,18 @@ public struct BSONBinary: BSONValue, Equatable, Codable, Hashable {
 
         /// Initializes a `Subtype` with a custom value. This value must be in the range 0x80-0xFF.
         /// - Throws:
-        ///   - `InvalidArgumentError` if value passed is outside of the range 0x80-0xFF
+        ///   - `MongoError.InvalidArgumentError` if value passed is outside of the range 0x80-0xFF
         public static func userDefined(_ value: Int) throws -> Subtype {
             guard let byteValue = UInt8(exactly: value) else {
-                throw InvalidArgumentError(message: "Cannot represent \(value) as UInt8")
+                throw MongoError.InvalidArgumentError(message: "Cannot represent \(value) as UInt8")
             }
             guard byteValue >= 0x80 else {
-                throw InvalidArgumentError(
+                throw MongoError.InvalidArgumentError(
                     message: "userDefined value must be greater than or equal to 0x80 got \(byteValue)"
                 )
             }
             guard let subtype = Subtype(rawValue: byteValue) else {
-                throw InvalidArgumentError(message: "Cannot represent \(byteValue) as Subtype")
+                throw MongoError.InvalidArgumentError(message: "Cannot represent \(byteValue) as Subtype")
             }
             return subtype
         }
@@ -360,7 +360,7 @@ public struct BSONBinary: BSONValue, Equatable, Codable, Hashable {
         }
 
         guard let data = self.data.getBytes(at: 0, length: 16) else {
-            throw InternalError(message: "Unable to read 16 bytes from Binary.data")
+            throw MongoError.InternalError(message: "Unable to read 16 bytes from Binary.data")
         }
 
         let uuid: uuid_t = (
@@ -524,7 +524,7 @@ public struct BSONDecimal128: BSONValue, Equatable, Codable, CustomStringConvert
      *   - a BSONDecimal128 number as a string.
      *
      * - Throws:
-     *   - A `InvalidArgumentError` if the string does not represent a BSONDecimal128 encodable value.
+     *   - A `MongoError.InvalidArgumentError` if the string does not represent a BSONDecimal128 encodable value.
      *
      * - SeeAlso: https://github.com/mongodb/specifications/blob/master/source/bson-decimal128/decimal128.rst
      */
@@ -862,11 +862,11 @@ public struct BSONObjectID: BSONValue, Equatable, CustomStringConvertible, Codab
 
     /// Initializes an `BSONObjectID` from the provided hex `String`.
     /// - Throws:
-    ///   - `InvalidArgumentError` if string passed is not a valid BSONObjectID
+    ///   - `MongoError.InvalidArgumentError` if string passed is not a valid BSONObjectID
     /// - SeeAlso: https://github.com/mongodb/specifications/blob/master/source/objectid.rst
     public init(_ hex: String) throws {
         guard bson_oid_is_valid(hex, hex.utf8.count) else {
-            throw InvalidArgumentError(message: "Cannot create ObjectId from \(hex)")
+            throw MongoError.InvalidArgumentError(message: "Cannot create ObjectId from \(hex)")
         }
         var oid_t = bson_oid_t()
         bson_oid_init_from_string(&oid_t, hex)

Sources/MongoSwift/BSON/Overwritable.swift

@@ -8,7 +8,8 @@ internal protocol Overwritable: BSONValue {
      *
      * - Throws:
      *   - `MongoError.InternalError` if the `BSONValue` is an `Int` and cannot be written to BSON.
-     *   - `MongoError.LogicError` if the `BSONValue` is a `BSONDecimal128` or `BSONObjectID` and is improperly formatted.
+     *   - `MongoError.LogicError` if the `BSONValue` is a `BSONDecimal128` or `BSONObjectID` and is improperly
+     *     formatted.
      */
     func writeToCurrentPosition(of iter: BSONDocumentIterator) throws
 }

Sources/MongoSwift/MongoCollection+BulkWrite.swift

@@ -401,7 +401,7 @@ public struct BulkWriteResult: Decodable {
      *   - insertedIDs: Map of inserted IDs
      *
      * - Throws:
-     *   - `InternalError` if an unexpected error occurs reading the reply from the server.
+     *   - `MongoError.InternalError` if an unexpected error occurs reading the reply from the server.
      */
     fileprivate init?(reply: BSONDocument, insertedIDs: [Int: BSON]) throws {
         guard reply.keys.contains(where: { MongocKeys(rawValue: $0) != nil }) else {

Sources/MongoSwift/MongoError.swift

@@ -472,7 +472,7 @@ private func extractWriteConcernError(from reply: BSONDocument) throws -> MongoE
 
 /// Internal function used by write methods performing single writes that are implemented via the bulk API. If the
 /// provided error is not a `MongoError.BulkWriteError`, it will be returned as-is. Otherwise, the error will be
-/// converted to a `MongoError.WriteError`. If conversion fails, an `InternalError` will be returned.
+/// converted to a `MongoError.WriteError`. If conversion fails, an `MongoError.InternalError` will be returned.
 internal func convertBulkWriteError(_ error: Error) -> Error {
     guard let bwe = error as? MongoError.BulkWriteError else {
         return error

Sources/TestsCommon/CommonTestUtils.swift

@@ -148,7 +148,7 @@ extension BSONDocument {
      *      - `T`: Any type conforming to the `BSONValue` protocol
      *  - Returns: The value stored under key, as type `T`
      *  - Throws:
-     *    - `InternalError` if the value cannot be cast to type `T` or is not in the `Document`, or an
+     *    - `MongoError.InternalError` if the value cannot be cast to type `T` or is not in the `Document`, or an
      *      unexpected error occurs while decoding the `BSONValue`.
      *
      */