Prefix uses of Message with

Author: mrabiciu

Sources/Conformance/main.swift

@@ -84,7 +84,7 @@ func buildResponse(serializedBytes: [UInt8]) -> Conformance_ConformanceResponse
         return response
     }
 
-    let msgType: SwiftProtobuf.Message.Type
+    let msgType: any SwiftProtobuf.Message.Type
     let extensions: SwiftProtobuf.ExtensionMap
     switch request.messageType {
     case "":
@@ -102,7 +102,7 @@ func buildResponse(serializedBytes: [UInt8]) -> Conformance_ConformanceResponse
         return response
     }
 
-    let testMessage: SwiftProtobuf.Message
+    let testMessage: any SwiftProtobuf.Message
     switch request.payload {
     case .protobufPayload(let data)?:
         do {

Sources/SwiftProtobuf/AnyMessageStorage.swift

@@ -16,7 +16,7 @@
 import Foundation
 
 fileprivate func serializeAnyJSON(
-  for message: Message,
+  for message: any Message,
   typeURL: String,
   options: JSONEncodingOptions
 ) throws -> String {
@@ -33,7 +33,7 @@ fileprivate func serializeAnyJSON(
   return visitor.stringResult
 }
 
-fileprivate func emitVerboseTextForm(visitor: inout TextFormatEncodingVisitor, message: Message, typeURL: String) {
+fileprivate func emitVerboseTextForm(visitor: inout TextFormatEncodingVisitor, message: any Message, typeURL: String) {
   let url: String
   if typeURL.isEmpty {
     url = buildTypeURL(forMessage: message, typePrefix: defaultAnyTypeURLPrefix)
@@ -55,7 +55,7 @@ fileprivate func asJSONObject(body: [UInt8]) -> Data {
 fileprivate func unpack(contentJSON: [UInt8],
                         extensions: ExtensionMap,
                         options: JSONDecodingOptions,
-                        as messageType: Message.Type) throws -> Message {
+                        as messageType: any Message.Type) throws -> any Message {
   guard messageType is _CustomJSONCodable.Type else {
     let contentJSONAsObject = asJSONObject(body: contentJSON)
     return try messageType.init(jsonUTF8Bytes: contentJSONAsObject, extensions: extensions, options: options)
@@ -135,7 +135,7 @@ internal class AnyMessageStorage {
     // unpacking that takes new options when a developer decides to decode it.
     case binary(Data)
     // a message
-    case message(Message)
+    case message(any Message)
     // parsed JSON with the @type removed and the decoding options.
     case contentJSON([UInt8], JSONDecodingOptions)
   }

Sources/SwiftProtobuf/BinaryDecoder.swift

@@ -1090,7 +1090,7 @@ internal struct BinaryDecoder: Decoder {
 
     internal mutating func decodeExtensionField(
       values: inout ExtensionFieldValueSet,
-      messageType: Message.Type,
+      messageType: any Message.Type,
       fieldNumber: Int
     ) throws {
         if let ext = extensions?[messageType, fieldNumber] {
@@ -1104,7 +1104,7 @@ internal struct BinaryDecoder: Decoder {
     /// Helper to reuse between Extension decoding and MessageSet Extension decoding.
     private mutating func decodeExtensionField(
       values: inout ExtensionFieldValueSet,
-      messageType: Message.Type,
+      messageType: any Message.Type,
       fieldNumber: Int,
       messageExtension ext: AnyMessageExtension
     ) throws {
@@ -1131,7 +1131,7 @@ internal struct BinaryDecoder: Decoder {
 
     internal mutating func decodeExtensionFieldsAsMessageSet(
       values: inout ExtensionFieldValueSet,
-      messageType: Message.Type
+      messageType: any Message.Type
     ) throws {
         // Spin looking for the Item group, everything else will end up in unknown fields.
         while let fieldNumber = try self.nextFieldNumber() {
@@ -1175,7 +1175,7 @@ internal struct BinaryDecoder: Decoder {
 
     private mutating func decodeMessageSetItem(
       values: inout ExtensionFieldValueSet,
-      messageType: Message.Type
+      messageType: any Message.Type
     ) throws -> DecodeMessageSetItemResult {
         // This is loosely based on the C++:
         //   ExtensionSet::ParseMessageSetItem()

Sources/SwiftProtobuf/BinaryDelimited.swift

@@ -65,7 +65,7 @@ public enum BinaryDelimited {
   ///           `BinaryDelimited.Error` for some writing errors, or the
   ///           underlying `OutputStream.streamError` for a stream error.
   public static func serialize(
-    message: Message,
+    message: any Message,
     to stream: OutputStream,
     partial: Bool = false
   ) throws {

Sources/SwiftProtobuf/Decoder.swift

@@ -204,11 +204,11 @@ public protocol Decoder {
   // Decode extension fields
 
   /// Decode an extension field
-  mutating func decodeExtensionField(values: inout ExtensionFieldValueSet, messageType: Message.Type, fieldNumber: Int) throws
+  mutating func decodeExtensionField(values: inout ExtensionFieldValueSet, messageType: any Message.Type, fieldNumber: Int) throws
 
   // Run a decode loop decoding the MessageSet format for Extensions.
   mutating func decodeExtensionFieldsAsMessageSet(values: inout ExtensionFieldValueSet,
-                                                  messageType: Message.Type) throws
+                                                  messageType: any Message.Type) throws
 }
 
 /// Most Decoders won't care about Extension handing as in MessageSet
@@ -217,7 +217,7 @@ public protocol Decoder {
 extension Decoder {
   public mutating func decodeExtensionFieldsAsMessageSet(
     values: inout ExtensionFieldValueSet,
-    messageType: Message.Type
+    messageType: any Message.Type
   ) throws {
     while let fieldNumber = try self.nextFieldNumber() {
       try self.decodeExtensionField(values: &values,

Sources/SwiftProtobuf/ExtensionMap.swift

@@ -24,7 +24,7 @@
 /// standard `SimpleExtensionMap` implementation.
 public protocol ExtensionMap: Sendable {
     /// Returns the extension object describing an extension or nil
-    subscript(messageType: Message.Type, fieldNumber: Int) -> AnyMessageExtension? { get }
+    subscript(messageType: any Message.Type, fieldNumber: Int) -> AnyMessageExtension? { get }
 
     /// Returns the field number for a message with a specific field name
     ///
@@ -34,5 +34,5 @@ public protocol ExtensionMap: Sendable {
     /// for the proto file and `message` is the name of the message in
     /// which the extension was defined. (This is different from the
     /// message that is being extended!)
-    func fieldNumberForProto(messageType: Message.Type, protoFieldName: String) -> Int?
+    func fieldNumberForProto(messageType: any Message.Type, protoFieldName: String) -> Int?
 }

Sources/SwiftProtobuf/Google_Protobuf_Any+Extensions.swift

@@ -38,7 +38,7 @@ extension Google_Protobuf_Any {
   /// - Throws: `BinaryEncodingError.missingRequiredFields` if `partial` is
   ///     false and `message` wasn't fully initialized.
   public init(
-    message: Message,
+    message: any Message,
     partial: Bool = false,
     typePrefix: String = defaultAnyTypeURLPrefix
   ) throws {

Sources/SwiftProtobuf/Google_Protobuf_Any+Registry.swift

@@ -26,7 +26,7 @@ fileprivate let knownTypesQueue =
 // TODO: Should these first four be exposed as methods to go with
 // the general registry support?
 
-internal func buildTypeURL(forMessage message: Message, typePrefix: String) -> String {
+internal func buildTypeURL(forMessage message: any Message, typePrefix: String) -> String {
   var url = typePrefix
   let needsSlash = typePrefix.isEmpty || typePrefix.last != "/"
   if needsSlash {
@@ -35,7 +35,7 @@ internal func buildTypeURL(forMessage message: Message, typePrefix: String) -> S
   return url + typeName(fromMessage: message)
 }
 
-internal func typeName(fromMessage message: Message) -> String {
+internal func typeName(fromMessage message: any Message) -> String {
   let messageType = type(of: message)
   return messageType.protoMessageName
 }
@@ -67,7 +67,7 @@ fileprivate final class UnsafeMutableTransferBox<Wrapped> {
 extension UnsafeMutableTransferBox: @unchecked Sendable {}
 
 // All access to this should be done on `knownTypesQueue`.
-fileprivate let knownTypes: UnsafeMutableTransferBox<[String:Message.Type]> = .init([
+fileprivate let knownTypes: UnsafeMutableTransferBox<[String: any Message.Type]> = .init([
   // Seeded with the Well Known Types.
   "google.protobuf.Any": Google_Protobuf_Any.self,
   "google.protobuf.BoolValue": Google_Protobuf_BoolValue.self,
@@ -117,7 +117,7 @@ extension Google_Protobuf_Any {
     ///
     /// Returns: true if the type was registered, false if something
     ///   else was already registered for the messageName.
-    @discardableResult public static func register(messageType: Message.Type) -> Bool {
+    @discardableResult public static func register(messageType: any Message.Type) -> Bool {
         let messageTypeName = messageType.protoMessageName
         var result: Bool = false
         execute(flags: .barrier) {
@@ -136,14 +136,14 @@ extension Google_Protobuf_Any {
     }
 
     /// Returns the Message.Type expected for the given type URL.
-    public static func messageType(forTypeURL url: String) -> Message.Type? {
+    public static func messageType(forTypeURL url: String) -> (any Message.Type)? {
       let messageTypeName = typeName(fromURL: url)
       return messageType(forMessageName: messageTypeName)
     }
 
     /// Returns the Message.Type expected for the given proto message name.
-    public static func messageType(forMessageName name: String) -> Message.Type? {
-        var result: Message.Type?
+    public static func messageType(forMessageName name: String) -> (any Message.Type)? {
+        var result: (any Message.Type)?
         execute(flags: .none) {
             result = knownTypes.wrappedValue[name]
         }

Sources/SwiftProtobuf/Internal.swift

@@ -29,7 +29,7 @@ public enum Internal {
 
   /// Helper to loop over a list of Messages to see if they are all
   /// initialized (see Message.isInitialized for what that means).
-  public static func areAllInitialized(_ listOfMessages: [Message]) -> Bool {
+  public static func areAllInitialized(_ listOfMessages: [any Message]) -> Bool {
     for msg in listOfMessages {
       if !msg.isInitialized {
         return false
@@ -40,7 +40,7 @@ public enum Internal {
 
   /// Helper to loop over dictionary with values that are Messages to see if
   /// they are all initialized (see Message.isInitialized for what that means).
-  public static func areAllInitialized<K>(_ mapToMessages: [K: Message]) -> Bool {
+  public static func areAllInitialized<K>(_ mapToMessages: [K: any Message]) -> Bool {
     for (_, msg) in mapToMessages {
       if !msg.isInitialized {
         return false

Sources/SwiftProtobuf/JSONDecoder.swift

@@ -16,7 +16,7 @@ import Foundation
 
 internal struct JSONDecoder: Decoder {
   internal var scanner: JSONScanner
-  internal var messageType: Message.Type
+  internal var messageType: any Message.Type
   private var fieldCount = 0
   private var isMapKey = false
   private var fieldNameMap: _NameMap?
@@ -30,14 +30,14 @@ internal struct JSONDecoder: Decoder {
   }
 
   internal init(source: UnsafeRawBufferPointer, options: JSONDecodingOptions,
-                messageType: Message.Type, extensions: ExtensionMap?) {
+                messageType: any Message.Type, extensions: ExtensionMap?) {
     let scanner = JSONScanner(source: source,
                                options: options,
                                extensions: extensions)
     self.init(scanner: scanner, messageType: messageType)
   }
 
-  private init(scanner: JSONScanner, messageType: Message.Type) {
+  private init(scanner: JSONScanner, messageType: any Message.Type) {
     self.scanner = scanner
     self.messageType = messageType
   }
@@ -730,7 +730,7 @@ internal struct JSONDecoder: Decoder {
 
   mutating func decodeExtensionField(
     values: inout ExtensionFieldValueSet,
-    messageType: Message.Type,
+    messageType: any Message.Type,
     fieldNumber: Int
   ) throws {
     // Force-unwrap: we can only get here if the extension exists.