Split SwiftProtobuf into SwiftProtobufCore & SwiftProtobufFoundationCompat

DevTools/LibraryVersions.py

@@ -19,7 +19,7 @@ _VERSION_RE = re.compile(r'^(?P<major>\d+)\.(?P<minor>\d+)(.(?P<revision>\d+))?$
 
 _PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 _PODSPEC_PATH = os.path.join(_PROJECT_ROOT, 'SwiftProtobuf.podspec')
-_VERSION_SWIFT_PATH = os.path.join(_PROJECT_ROOT, 'Sources/SwiftProtobuf/Version.swift')
+_VERSION_SWIFT_PATH = os.path.join(_PROJECT_ROOT, 'Sources/SwiftProtobufCore/Version.swift')
 
 def Fail(message):
   sys.stderr.write('Error: %s\n' % message)

Makefile

@@ -330,7 +330,7 @@ regenerate-library-protos: build ${PROTOC_GEN_SWIFT}
 	${GENERATE_SRCS} \
 		--tfiws_opt=FileNaming=DropPath \
 		--tfiws_opt=Visibility=Public \
-		--tfiws_out=Sources/SwiftProtobuf \
+		--tfiws_out=Sources/SwiftProtobufCore \
 		${LIBRARY_PROTOS}
 
 # Rebuild just the protos used by the plugin
@@ -411,7 +411,7 @@ Tests/protoc-gen-swiftTests/DescriptorTestData.swift: build ${PROTOC_GEN_SWIFT}
 # public protocol, struct, enum, or class name, as well as every
 # method or property defined in a public protocol, struct, or class.
 # It also gives us a large collection of Swift names.
-Protos/mined_words.txt: Sources/SwiftProtobuf/*.swift
+Protos/mined_words.txt: Sources/SwiftProtobufCore/*.swift
 	@echo Building $@
 	@cat $^ | \
 	grep -E '\b(public|func|var)\b' | \

Package.swift

@@ -36,9 +36,17 @@ let package = Package(
   ],
   targets: [
     .target(
-        name: "SwiftProtobuf",
+        name: "SwiftProtobufCore",
         exclude: ["CMakeLists.txt"]
     ),
+    .target(
+        name: "SwiftProtobufFoundationCompat",
+        dependencies: ["SwiftProtobufCore"]
+    ),
+    .target(
+        name: "SwiftProtobuf",
+        dependencies: ["SwiftProtobufCore", "SwiftProtobufFoundationCompat"]
+    ),
     .target(
         name: "SwiftProtobufPluginLibrary",
         dependencies: ["SwiftProtobuf"],
@@ -67,7 +75,7 @@ let package = Package(
     ),
     .testTarget(
         name: "SwiftProtobufTests",
-        dependencies: ["SwiftProtobuf"]
+        dependencies: ["SwiftProtobufCore"]
     ),
     .testTarget(
         name: "SwiftProtobufPluginLibraryTests",

Protos/generated_swift_names_enum_cases.proto

@@ -742,7 +742,7 @@ enum GeneratedSwiftReservedEnum {
   subVisitor = 735;
   Swift = 736;
   swiftPrefix = 737;
-  SwiftProtobuf = 738;
+  SwiftProtobufCore = 738;
   syntax = 739;
   T = 740;
   tag = 741;

Protos/generated_swift_names_enums.proto

@@ -741,7 +741,7 @@ message GeneratedSwiftReservedEnums {
   enum subVisitor { NONE_subVisitor = 0; }
   enum Swift { NONE_Swift = 0; }
   enum swiftPrefix { NONE_swiftPrefix = 0; }
-  enum SwiftProtobuf { NONE_SwiftProtobuf = 0; }
+  enum SwiftProtobufCore { NONE_SwiftProtobufCore = 0; }
   enum syntax { NONE_syntax = 0; }
   enum T { NONE_T = 0; }
   enum tag { NONE_tag = 0; }

Protos/generated_swift_names_fields.proto

@@ -741,7 +741,7 @@ message GeneratedSwiftReservedFields {
   int32 subVisitor = 735;
   int32 Swift = 736;
   int32 swiftPrefix = 737;
-  int32 SwiftProtobuf = 738;
+  int32 SwiftProtobufCore = 738;
   int32 syntax = 739;
   int32 T = 740;
   int32 tag = 741;

Protos/generated_swift_names_messages.proto

@@ -741,7 +741,7 @@ message GeneratedSwiftReservedMessages {
   message subVisitor { int32 subVisitor = 1; }
   message Swift { int32 Swift = 1; }
   message swiftPrefix { int32 swiftPrefix = 1; }
-  message SwiftProtobuf { int32 SwiftProtobuf = 1; }
+  message SwiftProtobufCore { int32 SwiftProtobufCore = 1; }
   message syntax { int32 syntax = 1; }
   message T { int32 T = 1; }
   message tag { int32 tag = 1; }

Sources/Conformance/conformance.pb.swift

@@ -38,19 +38,19 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import Foundation
-import SwiftProtobuf
+import SwiftProtobufCore
 
 // If the compiler emits an error on this type, it is because this file
 // was generated by a version of the `protoc` Swift plug-in that is
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
-enum Conformance_WireFormat: SwiftProtobuf.Enum {
+enum Conformance_WireFormat: SwiftProtobufCore.Enum {
   typealias RawValue = Int
   case unspecified // = 0
   case protobuf // = 1
@@ -98,7 +98,7 @@ enum Conformance_WireFormat: SwiftProtobuf.Enum {
 
 }
 
-enum Conformance_TestCategory: SwiftProtobuf.Enum {
+enum Conformance_TestCategory: SwiftProtobufCore.Enum {
   typealias RawValue = Int
   case unspecifiedTest // = 0
 
@@ -168,13 +168,13 @@ enum Conformance_TestCategory: SwiftProtobuf.Enum {
 /// This will be known by message_type == "conformance.FailureSet", a conformance
 /// test should return a serialized FailureSet in protobuf_payload.
 struct Conformance_FailureSet {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   var failure: [String] = []
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 }
@@ -185,7 +185,7 @@ struct Conformance_FailureSet {
 ///   2. parse the protobuf or JSON payload in "payload" (which may fail)
 ///   3. if the parse succeeded, serialize the message in the requested format.
 struct Conformance_ConformanceRequest {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -254,7 +254,7 @@ struct Conformance_ConformanceRequest {
   /// unknown fields instead of ignore. This feature is optional.
   var printUnknownFields: Bool = false
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   /// The payload (whether protobuf of JSON) is always for a
   /// protobuf_test_messages.proto3.TestAllTypes proto (as defined in
@@ -275,7 +275,7 @@ struct Conformance_ConformanceRequest {
 
 /// Represents a single test case's output.
 struct Conformance_ConformanceResponse {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -378,7 +378,7 @@ struct Conformance_ConformanceResponse {
     set {result = .textPayload(newValue)}
   }
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   enum OneOf_Result: Equatable {
     /// This string should be set to indicate parsing failed.  The string can
@@ -423,14 +423,14 @@ struct Conformance_ConformanceResponse {
 
 /// Encoding options for jspb format.
 struct Conformance_JspbEncodingConfig {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// Encode the value field of Any as jspb array if true, otherwise binary.
   var useJspbArrayAnyFormat: Bool = false
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 }
@@ -448,8 +448,8 @@ extension Conformance_JspbEncodingConfig: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "conformance"
 
-extension Conformance_WireFormat: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension Conformance_WireFormat: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "UNSPECIFIED"),
     1: .same(proto: "PROTOBUF"),
     2: .same(proto: "JSON"),
@@ -458,8 +458,8 @@ extension Conformance_WireFormat: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension Conformance_TestCategory: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension Conformance_TestCategory: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "UNSPECIFIED_TEST"),
     1: .same(proto: "BINARY_TEST"),
     2: .same(proto: "JSON_TEST"),
@@ -469,13 +469,13 @@ extension Conformance_TestCategory: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension Conformance_FailureSet: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Conformance_FailureSet: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".FailureSet"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "failure"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -487,7 +487,7 @@ extension Conformance_FailureSet: SwiftProtobuf.Message, SwiftProtobuf._MessageI
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.failure.isEmpty {
       try visitor.visitRepeatedStringField(value: self.failure, fieldNumber: 1)
     }
@@ -501,9 +501,9 @@ extension Conformance_FailureSet: SwiftProtobuf.Message, SwiftProtobuf._MessageI
   }
 }
 
-extension Conformance_ConformanceRequest: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Conformance_ConformanceRequest: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ConformanceRequest"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "protobuf_payload"),
     2: .standard(proto: "json_payload"),
     7: .standard(proto: "jspb_payload"),
@@ -515,7 +515,7 @@ extension Conformance_ConformanceRequest: SwiftProtobuf.Message, SwiftProtobuf._
     9: .standard(proto: "print_unknown_fields"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -563,7 +563,7 @@ extension Conformance_ConformanceRequest: SwiftProtobuf.Message, SwiftProtobuf._
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -620,9 +620,9 @@ extension Conformance_ConformanceRequest: SwiftProtobuf.Message, SwiftProtobuf._
   }
 }
 
-extension Conformance_ConformanceResponse: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Conformance_ConformanceResponse: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ConformanceResponse"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "parse_error"),
     6: .standard(proto: "serialize_error"),
     9: .standard(proto: "timeout_error"),
@@ -634,7 +634,7 @@ extension Conformance_ConformanceResponse: SwiftProtobuf.Message, SwiftProtobuf.
     8: .standard(proto: "text_payload"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -717,7 +717,7 @@ extension Conformance_ConformanceResponse: SwiftProtobuf.Message, SwiftProtobuf.
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -771,13 +771,13 @@ extension Conformance_ConformanceResponse: SwiftProtobuf.Message, SwiftProtobuf.
   }
 }
 
-extension Conformance_JspbEncodingConfig: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Conformance_JspbEncodingConfig: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".JspbEncodingConfig"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "use_jspb_array_any_format"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -789,7 +789,7 @@ extension Conformance_JspbEncodingConfig: SwiftProtobuf.Message, SwiftProtobuf._
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.useJspbArrayAnyFormat != false {
       try visitor.visitSingularBoolField(value: self.useJspbArrayAnyFormat, fieldNumber: 1)
     }

Sources/Conformance/test_messages_proto2.pb.swift

@@ -44,19 +44,19 @@
 // LINT: ALLOW_GROUPS
 
 import Foundation
-import SwiftProtobuf
+import SwiftProtobufCore
 
 // If the compiler emits an error on this type, it is because this file
 // was generated by a version of the `protoc` Swift plug-in that is
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
-enum ProtobufTestMessages_Proto2_ForeignEnumProto2: SwiftProtobuf.Enum {
+enum ProtobufTestMessages_Proto2_ForeignEnumProto2: SwiftProtobufCore.Enum {
   typealias RawValue = Int
   case foreignFoo // = 0
   case foreignBar // = 1
@@ -92,8 +92,8 @@ enum ProtobufTestMessages_Proto2_ForeignEnumProto2: SwiftProtobuf.Enum {
 /// submessages of this message.  So for example, a fuzz test of TestAllTypes
 /// could trigger bugs that occur in any message type in this file.  We verify
 /// this stays true in a unit test.
-struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleMessage {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobufCore.ExtensibleMessage {
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -1026,7 +1026,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
   /// Clears the value of `fieldName18__`. Subsequent reads from it will return its default value.
   mutating func clearFieldName18__() {_uniqueStorage()._fieldName18__ = nil}
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   enum OneOf_OneofField: Equatable {
     case oneofUint32(UInt32)
@@ -1046,7 +1046,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
 
   }
 
-  enum NestedEnum: SwiftProtobuf.Enum {
+  enum NestedEnum: SwiftProtobufCore.Enum {
     typealias RawValue = Int
     case foo // = 0
     case bar // = 1
@@ -1081,7 +1081,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
   }
 
   struct NestedMessage {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
@@ -1103,7 +1103,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
     /// Clears the value of `corecursive`. Subsequent reads from it will return its default value.
     mutating func clearCorecursive() {_uniqueStorage()._corecursive = nil}
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
 
@@ -1112,7 +1112,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
 
   /// groups
   struct DataMessage {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
@@ -1134,7 +1134,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
     /// Clears the value of `groupUint32`. Subsequent reads from it will return its default value.
     mutating func clearGroupUint32() {self._groupUint32 = nil}
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
 
@@ -1143,20 +1143,20 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
   }
 
   /// message_set test case.
-  struct MessageSetCorrect: SwiftProtobuf.ExtensibleMessage {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+  struct MessageSetCorrect: SwiftProtobufCore.ExtensibleMessage {
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
 
-    var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
+    var _protobuf_extensionFieldValues = SwiftProtobufCore.ExtensionFieldValueSet()
   }
 
   struct MessageSetCorrectExtension1 {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
@@ -1169,7 +1169,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
     /// Clears the value of `str`. Subsequent reads from it will return its default value.
     mutating func clearStr() {self._str = nil}
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
 
@@ -1177,7 +1177,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
   }
 
   struct MessageSetCorrectExtension2 {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
@@ -1190,7 +1190,7 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
     /// Clears the value of `i`. Subsequent reads from it will return its default value.
     mutating func clearI() {self._i = nil}
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
 
@@ -1199,12 +1199,12 @@ struct ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.ExtensibleM
 
   init() {}
 
-  var _protobuf_extensionFieldValues = SwiftProtobuf.ExtensionFieldValueSet()
+  var _protobuf_extensionFieldValues = SwiftProtobufCore.ExtensionFieldValueSet()
   fileprivate var _storage = _StorageClass.defaultInstance
 }
 
 struct ProtobufTestMessages_Proto2_ForeignMessageProto2 {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -1217,7 +1217,7 @@ struct ProtobufTestMessages_Proto2_ForeignMessageProto2 {
   /// Clears the value of `c`. Subsequent reads from it will return its default value.
   mutating func clearC() {self._c = nil}
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 
@@ -1225,7 +1225,7 @@ struct ProtobufTestMessages_Proto2_ForeignMessageProto2 {
 }
 
 struct ProtobufTestMessages_Proto2_UnknownToTestAllTypes {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -1276,10 +1276,10 @@ struct ProtobufTestMessages_Proto2_UnknownToTestAllTypes {
 
   var repeatedInt32: [Int32] = []
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   struct OptionalGroup {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
@@ -1292,7 +1292,7 @@ struct ProtobufTestMessages_Proto2_UnknownToTestAllTypes {
     /// Clears the value of `a`. Subsequent reads from it will return its default value.
     mutating func clearA() {self._a = nil}
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
 
@@ -1309,23 +1309,23 @@ struct ProtobufTestMessages_Proto2_UnknownToTestAllTypes {
 }
 
 struct ProtobufTestMessages_Proto2_NullHypothesisProto2 {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 }
 
 struct ProtobufTestMessages_Proto2_EnumOnlyProto2 {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
-  enum BoolEnum: SwiftProtobuf.Enum {
+  enum BoolEnum: SwiftProtobufCore.Enum {
     typealias RawValue = Int
     case kFalse // = 0
     case kTrue // = 1
@@ -1355,7 +1355,7 @@ struct ProtobufTestMessages_Proto2_EnumOnlyProto2 {
 }
 
 struct ProtobufTestMessages_Proto2_OneStringProto2 {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -1368,7 +1368,7 @@ struct ProtobufTestMessages_Proto2_OneStringProto2 {
   /// Clears the value of `data`. Subsequent reads from it will return its default value.
   mutating func clearData() {self._data = nil}
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 
@@ -1376,7 +1376,7 @@ struct ProtobufTestMessages_Proto2_OneStringProto2 {
 }
 
 struct ProtobufTestMessages_Proto2_ProtoWithKeywords {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -1400,7 +1400,7 @@ struct ProtobufTestMessages_Proto2_ProtoWithKeywords {
 
   var requires: [String] = []
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 
@@ -1492,7 +1492,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect {
 /// this .proto file. It can be used any place an `SwiftProtobuf.ExtensionMap` is needed
 /// in parsing, or it can be combined with other `SwiftProtobuf.SimpleExtensionMap`s to create
 /// a larger `SwiftProtobuf.SimpleExtensionMap`.
-let ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions: SwiftProtobuf.SimpleExtensionMap = [
+let ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions: SwiftProtobufCore.SimpleExtensionMap = [
   ProtobufTestMessages_Proto2_Extensions_extension_int32,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1.Extensions.message_set_extension,
   ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2.Extensions.message_set_extension
@@ -1502,14 +1502,14 @@ let ProtobufTestMessages_Proto2_TestMessagesProto2_Extensions: SwiftProtobuf.Sim
 // constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
 // accessors for the extension fields on the messages directly.
 
-let ProtobufTestMessages_Proto2_Extensions_extension_int32 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufTestMessages_Proto2_TestAllTypesProto2>(
+let ProtobufTestMessages_Proto2_Extensions_extension_int32 = SwiftProtobufCore.MessageExtension<SwiftProtobufCore.OptionalExtensionField<SwiftProtobufCore.ProtobufInt32>, ProtobufTestMessages_Proto2_TestAllTypesProto2>(
   _protobuf_fieldNumber: 120,
   fieldName: "protobuf_test_messages.proto2.extension_int32"
 )
 
 extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1 {
   enum Extensions {
-    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+    static let message_set_extension = SwiftProtobufCore.MessageExtension<SwiftProtobufCore.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1>, ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect>(
       _protobuf_fieldNumber: 1547769,
       fieldName: "protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension1"
     )
@@ -1518,7 +1518,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
 
 extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2 {
   enum Extensions {
-    static let message_set_extension = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2>, ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect>(
+    static let message_set_extension = SwiftProtobufCore.MessageExtension<SwiftProtobufCore.OptionalMessageExtensionField<ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2>, ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect>(
       _protobuf_fieldNumber: 4135312,
       fieldName: "protobuf_test_messages.proto2.TestAllTypesProto2.MessageSetCorrectExtension2"
     )
@@ -1529,17 +1529,17 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
 
 fileprivate let _protobuf_package = "protobuf_test_messages.proto2"
 
-extension ProtobufTestMessages_Proto2_ForeignEnumProto2: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ProtobufTestMessages_Proto2_ForeignEnumProto2: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "FOREIGN_FOO"),
     1: .same(proto: "FOREIGN_BAR"),
     2: .same(proto: "FOREIGN_BAZ"),
   ]
 }
 
-extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestAllTypesProto2"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "optional_int32"),
     2: .standard(proto: "optional_int64"),
     3: .standard(proto: "optional_uint32"),
@@ -1947,14 +1947,14 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     return withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       if let v = _storage._optionalNestedMessage, !v.isInitialized {return false}
       if let v = _storage._recursiveMessage, !v.isInitialized {return false}
-      if !SwiftProtobuf.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
-      if !SwiftProtobuf.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
+      if !SwiftProtobufCore.Internal.areAllInitialized(_storage._repeatedNestedMessage) {return false}
+      if !SwiftProtobufCore.Internal.areAllInitialized(_storage._mapStringNestedMessage) {return false}
       if let v = _storage._oneofField, !v.isInitialized {return false}
       return true
     }
   }
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     _ = _uniqueStorage()
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       while let fieldNumber = try decoder.nextFieldNumber() {
@@ -2005,25 +2005,25 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         case 52: try { try decoder.decodeRepeatedEnumField(value: &_storage._repeatedForeignEnum) }()
         case 54: try { try decoder.decodeRepeatedStringField(value: &_storage._repeatedStringPiece) }()
         case 55: try { try decoder.decodeRepeatedStringField(value: &_storage._repeatedCord) }()
-        case 56: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: &_storage._mapInt32Int32) }()
-        case 57: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, value: &_storage._mapInt64Int64) }()
-        case 58: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, value: &_storage._mapUint32Uint32) }()
-        case 59: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, value: &_storage._mapUint64Uint64) }()
-        case 60: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, value: &_storage._mapSint32Sint32) }()
-        case 61: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, value: &_storage._mapSint64Sint64) }()
-        case 62: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, value: &_storage._mapFixed32Fixed32) }()
-        case 63: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, value: &_storage._mapFixed64Fixed64) }()
-        case 64: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, value: &_storage._mapSfixed32Sfixed32) }()
-        case 65: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, value: &_storage._mapSfixed64Sfixed64) }()
-        case 66: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, value: &_storage._mapInt32Float) }()
-        case 67: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, value: &_storage._mapInt32Double) }()
-        case 68: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
-        case 69: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &_storage._mapStringString) }()
-        case 70: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, value: &_storage._mapStringBytes) }()
-        case 71: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, value: &_storage._mapStringNestedMessage) }()
-        case 72: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, value: &_storage._mapStringForeignMessage) }()
-        case 73: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, value: &_storage._mapStringNestedEnum) }()
-        case 74: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, value: &_storage._mapStringForeignEnum) }()
+        case 56: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufInt32>.self, value: &_storage._mapInt32Int32) }()
+        case 57: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt64,SwiftProtobufCore.ProtobufInt64>.self, value: &_storage._mapInt64Int64) }()
+        case 58: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt32,SwiftProtobufCore.ProtobufUInt32>.self, value: &_storage._mapUint32Uint32) }()
+        case 59: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt64,SwiftProtobufCore.ProtobufUInt64>.self, value: &_storage._mapUint64Uint64) }()
+        case 60: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt32,SwiftProtobufCore.ProtobufSInt32>.self, value: &_storage._mapSint32Sint32) }()
+        case 61: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt64,SwiftProtobufCore.ProtobufSInt64>.self, value: &_storage._mapSint64Sint64) }()
+        case 62: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed32,SwiftProtobufCore.ProtobufFixed32>.self, value: &_storage._mapFixed32Fixed32) }()
+        case 63: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed64,SwiftProtobufCore.ProtobufFixed64>.self, value: &_storage._mapFixed64Fixed64) }()
+        case 64: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed32,SwiftProtobufCore.ProtobufSFixed32>.self, value: &_storage._mapSfixed32Sfixed32) }()
+        case 65: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed64,SwiftProtobufCore.ProtobufSFixed64>.self, value: &_storage._mapSfixed64Sfixed64) }()
+        case 66: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufFloat>.self, value: &_storage._mapInt32Float) }()
+        case 67: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufDouble>.self, value: &_storage._mapInt32Double) }()
+        case 68: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufBool,SwiftProtobufCore.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
+        case 69: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufString>.self, value: &_storage._mapStringString) }()
+        case 70: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufBytes>.self, value: &_storage._mapStringBytes) }()
+        case 71: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, value: &_storage._mapStringNestedMessage) }()
+        case 72: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, value: &_storage._mapStringForeignMessage) }()
+        case 73: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, value: &_storage._mapStringNestedEnum) }()
+        case 74: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, value: &_storage._mapStringForeignEnum) }()
         case 75: try { try decoder.decodeRepeatedInt32Field(value: &_storage._packedInt32) }()
         case 76: try { try decoder.decodeRepeatedInt64Field(value: &_storage._packedInt64) }()
         case 77: try { try decoder.decodeRepeatedUInt32Field(value: &_storage._packedUint32) }()
@@ -2171,7 +2171,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every if/case branch local when no optimizations
@@ -2307,61 +2307,61 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
         try visitor.visitRepeatedStringField(value: _storage._repeatedCord, fieldNumber: 55)
       }
       if !_storage._mapInt32Int32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: _storage._mapInt32Int32, fieldNumber: 56)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufInt32>.self, value: _storage._mapInt32Int32, fieldNumber: 56)
       }
       if !_storage._mapInt64Int64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, value: _storage._mapInt64Int64, fieldNumber: 57)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt64,SwiftProtobufCore.ProtobufInt64>.self, value: _storage._mapInt64Int64, fieldNumber: 57)
       }
       if !_storage._mapUint32Uint32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, value: _storage._mapUint32Uint32, fieldNumber: 58)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt32,SwiftProtobufCore.ProtobufUInt32>.self, value: _storage._mapUint32Uint32, fieldNumber: 58)
       }
       if !_storage._mapUint64Uint64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, value: _storage._mapUint64Uint64, fieldNumber: 59)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt64,SwiftProtobufCore.ProtobufUInt64>.self, value: _storage._mapUint64Uint64, fieldNumber: 59)
       }
       if !_storage._mapSint32Sint32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, value: _storage._mapSint32Sint32, fieldNumber: 60)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt32,SwiftProtobufCore.ProtobufSInt32>.self, value: _storage._mapSint32Sint32, fieldNumber: 60)
       }
       if !_storage._mapSint64Sint64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, value: _storage._mapSint64Sint64, fieldNumber: 61)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt64,SwiftProtobufCore.ProtobufSInt64>.self, value: _storage._mapSint64Sint64, fieldNumber: 61)
       }
       if !_storage._mapFixed32Fixed32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, value: _storage._mapFixed32Fixed32, fieldNumber: 62)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed32,SwiftProtobufCore.ProtobufFixed32>.self, value: _storage._mapFixed32Fixed32, fieldNumber: 62)
       }
       if !_storage._mapFixed64Fixed64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, value: _storage._mapFixed64Fixed64, fieldNumber: 63)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed64,SwiftProtobufCore.ProtobufFixed64>.self, value: _storage._mapFixed64Fixed64, fieldNumber: 63)
       }
       if !_storage._mapSfixed32Sfixed32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, value: _storage._mapSfixed32Sfixed32, fieldNumber: 64)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed32,SwiftProtobufCore.ProtobufSFixed32>.self, value: _storage._mapSfixed32Sfixed32, fieldNumber: 64)
       }
       if !_storage._mapSfixed64Sfixed64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, value: _storage._mapSfixed64Sfixed64, fieldNumber: 65)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed64,SwiftProtobufCore.ProtobufSFixed64>.self, value: _storage._mapSfixed64Sfixed64, fieldNumber: 65)
       }
       if !_storage._mapInt32Float.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, value: _storage._mapInt32Float, fieldNumber: 66)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufFloat>.self, value: _storage._mapInt32Float, fieldNumber: 66)
       }
       if !_storage._mapInt32Double.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, value: _storage._mapInt32Double, fieldNumber: 67)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufDouble>.self, value: _storage._mapInt32Double, fieldNumber: 67)
       }
       if !_storage._mapBoolBool.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: _storage._mapBoolBool, fieldNumber: 68)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufBool,SwiftProtobufCore.ProtobufBool>.self, value: _storage._mapBoolBool, fieldNumber: 68)
       }
       if !_storage._mapStringString.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: _storage._mapStringString, fieldNumber: 69)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufString>.self, value: _storage._mapStringString, fieldNumber: 69)
       }
       if !_storage._mapStringBytes.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, value: _storage._mapStringBytes, fieldNumber: 70)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufBytes>.self, value: _storage._mapStringBytes, fieldNumber: 70)
       }
       if !_storage._mapStringNestedMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, value: _storage._mapStringNestedMessage, fieldNumber: 71)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, value: _storage._mapStringNestedMessage, fieldNumber: 71)
       }
       if !_storage._mapStringForeignMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, value: _storage._mapStringForeignMessage, fieldNumber: 72)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, value: _storage._mapStringForeignMessage, fieldNumber: 72)
       }
       if !_storage._mapStringNestedEnum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, value: _storage._mapStringNestedEnum, fieldNumber: 73)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, value: _storage._mapStringNestedEnum, fieldNumber: 73)
       }
       if !_storage._mapStringForeignEnum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, value: _storage._mapStringForeignEnum, fieldNumber: 74)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, value: _storage._mapStringForeignEnum, fieldNumber: 74)
       }
       if !_storage._packedInt32.isEmpty {
         try visitor.visitPackedInt32Field(value: _storage._packedInt32, fieldNumber: 75)
@@ -2733,8 +2733,8 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     -1: .same(proto: "NEG"),
     0: .same(proto: "FOO"),
     1: .same(proto: "BAR"),
@@ -2742,9 +2742,9 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum: SwiftProtob
   ]
 }
 
-extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".NestedMessage"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "a"),
     2: .same(proto: "corecursive"),
   ]
@@ -2777,7 +2777,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
     }
   }
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     _ = _uniqueStorage()
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       while let fieldNumber = try decoder.nextFieldNumber() {
@@ -2793,7 +2793,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every if/case branch local when no optimizations
@@ -2825,14 +2825,14 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
   }
 }
 
-extension ProtobufTestMessages_Proto2_TestAllTypesProto2.DataMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.DataMessage: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".Data"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     202: .standard(proto: "group_int32"),
     203: .standard(proto: "group_uint32"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -2845,7 +2845,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.DataMessage: SwiftProto
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -2867,20 +2867,20 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.DataMessage: SwiftProto
   }
 }
 
-extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".MessageSetCorrect"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+  static let _protobuf_nameMap = SwiftProtobufCore._NameMap()
 
   public var isInitialized: Bool {
     if !_protobuf_extensionFieldValues.isInitialized {return false}
     return true
   }
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     try decoder.decodeExtensionFieldsAsMessageSet(values: &_protobuf_extensionFieldValues, messageType: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect.self)
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try visitor.visitExtensionFieldsAsMessageSet(fields: _protobuf_extensionFieldValues, start: 4, end: 2147483647)
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -2892,13 +2892,13 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect: Swif
   }
 }
 
-extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension1: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".MessageSetCorrectExtension1"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     25: .same(proto: "str"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -2910,7 +2910,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -2928,13 +2928,13 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
-extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtension2: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = ProtobufTestMessages_Proto2_TestAllTypesProto2.protoMessageName + ".MessageSetCorrectExtension2"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     9: .same(proto: "i"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -2946,7 +2946,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -2964,13 +2964,13 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens
   }
 }
 
-extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessageProto2"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "c"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -2982,7 +2982,7 @@ extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobuf.Messag
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -3000,9 +3000,9 @@ extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobuf.Messag
   }
 }
 
-extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".UnknownToTestAllTypes"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1001: .standard(proto: "optional_int32"),
     1002: .standard(proto: "optional_string"),
     1003: .standard(proto: "nested_message"),
@@ -3011,7 +3011,7 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Messa
     1011: .standard(proto: "repeated_int32"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -3028,7 +3028,7 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Messa
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -3066,13 +3066,13 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Messa
   }
 }
 
-extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes.OptionalGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes.OptionalGroup: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = ProtobufTestMessages_Proto2_UnknownToTestAllTypes.protoMessageName + ".OptionalGroup"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "a"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -3084,7 +3084,7 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes.OptionalGroup: Swift
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -3102,16 +3102,16 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes.OptionalGroup: Swift
   }
 }
 
-extension ProtobufTestMessages_Proto2_NullHypothesisProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_NullHypothesisProto2: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NullHypothesisProto2"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+  static let _protobuf_nameMap = SwiftProtobufCore._NameMap()
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let _ = try decoder.nextFieldNumber() {
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try unknownFields.traverse(visitor: &visitor)
   }
 
@@ -3121,16 +3121,16 @@ extension ProtobufTestMessages_Proto2_NullHypothesisProto2: SwiftProtobuf.Messag
   }
 }
 
-extension ProtobufTestMessages_Proto2_EnumOnlyProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_EnumOnlyProto2: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".EnumOnlyProto2"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+  static let _protobuf_nameMap = SwiftProtobufCore._NameMap()
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let _ = try decoder.nextFieldNumber() {
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try unknownFields.traverse(visitor: &visitor)
   }
 
@@ -3140,20 +3140,20 @@ extension ProtobufTestMessages_Proto2_EnumOnlyProto2: SwiftProtobuf.Message, Swi
   }
 }
 
-extension ProtobufTestMessages_Proto2_EnumOnlyProto2.BoolEnum: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ProtobufTestMessages_Proto2_EnumOnlyProto2.BoolEnum: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "kFalse"),
     1: .same(proto: "kTrue"),
   ]
 }
 
-extension ProtobufTestMessages_Proto2_OneStringProto2: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_OneStringProto2: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".OneStringProto2"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "data"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -3165,7 +3165,7 @@ extension ProtobufTestMessages_Proto2_OneStringProto2: SwiftProtobuf.Message, Sw
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -3183,15 +3183,15 @@ extension ProtobufTestMessages_Proto2_OneStringProto2: SwiftProtobuf.Message, Sw
   }
 }
 
-extension ProtobufTestMessages_Proto2_ProtoWithKeywords: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto2_ProtoWithKeywords: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ProtoWithKeywords"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "inline"),
     2: .same(proto: "concept"),
     3: .same(proto: "requires"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -3205,7 +3205,7 @@ extension ProtobufTestMessages_Proto2_ProtoWithKeywords: SwiftProtobuf.Message,
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and

Sources/Conformance/test_messages_proto3.pb.swift

@@ -44,19 +44,19 @@
 // - conformance tests
 
 import Foundation
-import SwiftProtobuf
+import SwiftProtobufCore
 
 // If the compiler emits an error on this type, it is because this file
 // was generated by a version of the `protoc` Swift plug-in that is
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
-enum ProtobufTestMessages_Proto3_ForeignEnum: SwiftProtobuf.Enum {
+enum ProtobufTestMessages_Proto3_ForeignEnum: SwiftProtobufCore.Enum {
   typealias RawValue = Int
   case foreignFoo // = 0
   case foreignBar // = 1
@@ -102,7 +102,7 @@ enum ProtobufTestMessages_Proto3_ForeignEnum: SwiftProtobuf.Enum {
 /// could trigger bugs that occur in any message type in this file.  We verify
 /// this stays true in a unit test.
 struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -655,7 +655,7 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
     set {_uniqueStorage()._oneofField = .oneofEnum(newValue)}
   }
 
-  var oneofNullValue: SwiftProtobuf.Google_Protobuf_NullValue {
+  var oneofNullValue: SwiftProtobufCore.Google_Protobuf_NullValue {
     get {
       if case .oneofNullValue(let v)? = _storage._oneofField {return v}
       return .nullValue
@@ -664,8 +664,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   }
 
   /// Well-known types
-  var optionalBoolWrapper: SwiftProtobuf.Google_Protobuf_BoolValue {
-    get {return _storage._optionalBoolWrapper ?? SwiftProtobuf.Google_Protobuf_BoolValue()}
+  var optionalBoolWrapper: SwiftProtobufCore.Google_Protobuf_BoolValue {
+    get {return _storage._optionalBoolWrapper ?? SwiftProtobufCore.Google_Protobuf_BoolValue()}
     set {_uniqueStorage()._optionalBoolWrapper = newValue}
   }
   /// Returns true if `optionalBoolWrapper` has been explicitly set.
@@ -673,8 +673,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalBoolWrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalBoolWrapper() {_uniqueStorage()._optionalBoolWrapper = nil}
 
-  var optionalInt32Wrapper: SwiftProtobuf.Google_Protobuf_Int32Value {
-    get {return _storage._optionalInt32Wrapper ?? SwiftProtobuf.Google_Protobuf_Int32Value()}
+  var optionalInt32Wrapper: SwiftProtobufCore.Google_Protobuf_Int32Value {
+    get {return _storage._optionalInt32Wrapper ?? SwiftProtobufCore.Google_Protobuf_Int32Value()}
     set {_uniqueStorage()._optionalInt32Wrapper = newValue}
   }
   /// Returns true if `optionalInt32Wrapper` has been explicitly set.
@@ -682,8 +682,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalInt32Wrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt32Wrapper() {_uniqueStorage()._optionalInt32Wrapper = nil}
 
-  var optionalInt64Wrapper: SwiftProtobuf.Google_Protobuf_Int64Value {
-    get {return _storage._optionalInt64Wrapper ?? SwiftProtobuf.Google_Protobuf_Int64Value()}
+  var optionalInt64Wrapper: SwiftProtobufCore.Google_Protobuf_Int64Value {
+    get {return _storage._optionalInt64Wrapper ?? SwiftProtobufCore.Google_Protobuf_Int64Value()}
     set {_uniqueStorage()._optionalInt64Wrapper = newValue}
   }
   /// Returns true if `optionalInt64Wrapper` has been explicitly set.
@@ -691,8 +691,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalInt64Wrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalInt64Wrapper() {_uniqueStorage()._optionalInt64Wrapper = nil}
 
-  var optionalUint32Wrapper: SwiftProtobuf.Google_Protobuf_UInt32Value {
-    get {return _storage._optionalUint32Wrapper ?? SwiftProtobuf.Google_Protobuf_UInt32Value()}
+  var optionalUint32Wrapper: SwiftProtobufCore.Google_Protobuf_UInt32Value {
+    get {return _storage._optionalUint32Wrapper ?? SwiftProtobufCore.Google_Protobuf_UInt32Value()}
     set {_uniqueStorage()._optionalUint32Wrapper = newValue}
   }
   /// Returns true if `optionalUint32Wrapper` has been explicitly set.
@@ -700,8 +700,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalUint32Wrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalUint32Wrapper() {_uniqueStorage()._optionalUint32Wrapper = nil}
 
-  var optionalUint64Wrapper: SwiftProtobuf.Google_Protobuf_UInt64Value {
-    get {return _storage._optionalUint64Wrapper ?? SwiftProtobuf.Google_Protobuf_UInt64Value()}
+  var optionalUint64Wrapper: SwiftProtobufCore.Google_Protobuf_UInt64Value {
+    get {return _storage._optionalUint64Wrapper ?? SwiftProtobufCore.Google_Protobuf_UInt64Value()}
     set {_uniqueStorage()._optionalUint64Wrapper = newValue}
   }
   /// Returns true if `optionalUint64Wrapper` has been explicitly set.
@@ -709,8 +709,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalUint64Wrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalUint64Wrapper() {_uniqueStorage()._optionalUint64Wrapper = nil}
 
-  var optionalFloatWrapper: SwiftProtobuf.Google_Protobuf_FloatValue {
-    get {return _storage._optionalFloatWrapper ?? SwiftProtobuf.Google_Protobuf_FloatValue()}
+  var optionalFloatWrapper: SwiftProtobufCore.Google_Protobuf_FloatValue {
+    get {return _storage._optionalFloatWrapper ?? SwiftProtobufCore.Google_Protobuf_FloatValue()}
     set {_uniqueStorage()._optionalFloatWrapper = newValue}
   }
   /// Returns true if `optionalFloatWrapper` has been explicitly set.
@@ -718,8 +718,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalFloatWrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalFloatWrapper() {_uniqueStorage()._optionalFloatWrapper = nil}
 
-  var optionalDoubleWrapper: SwiftProtobuf.Google_Protobuf_DoubleValue {
-    get {return _storage._optionalDoubleWrapper ?? SwiftProtobuf.Google_Protobuf_DoubleValue()}
+  var optionalDoubleWrapper: SwiftProtobufCore.Google_Protobuf_DoubleValue {
+    get {return _storage._optionalDoubleWrapper ?? SwiftProtobufCore.Google_Protobuf_DoubleValue()}
     set {_uniqueStorage()._optionalDoubleWrapper = newValue}
   }
   /// Returns true if `optionalDoubleWrapper` has been explicitly set.
@@ -727,8 +727,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalDoubleWrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalDoubleWrapper() {_uniqueStorage()._optionalDoubleWrapper = nil}
 
-  var optionalStringWrapper: SwiftProtobuf.Google_Protobuf_StringValue {
-    get {return _storage._optionalStringWrapper ?? SwiftProtobuf.Google_Protobuf_StringValue()}
+  var optionalStringWrapper: SwiftProtobufCore.Google_Protobuf_StringValue {
+    get {return _storage._optionalStringWrapper ?? SwiftProtobufCore.Google_Protobuf_StringValue()}
     set {_uniqueStorage()._optionalStringWrapper = newValue}
   }
   /// Returns true if `optionalStringWrapper` has been explicitly set.
@@ -736,8 +736,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalStringWrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalStringWrapper() {_uniqueStorage()._optionalStringWrapper = nil}
 
-  var optionalBytesWrapper: SwiftProtobuf.Google_Protobuf_BytesValue {
-    get {return _storage._optionalBytesWrapper ?? SwiftProtobuf.Google_Protobuf_BytesValue()}
+  var optionalBytesWrapper: SwiftProtobufCore.Google_Protobuf_BytesValue {
+    get {return _storage._optionalBytesWrapper ?? SwiftProtobufCore.Google_Protobuf_BytesValue()}
     set {_uniqueStorage()._optionalBytesWrapper = newValue}
   }
   /// Returns true if `optionalBytesWrapper` has been explicitly set.
@@ -745,53 +745,53 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalBytesWrapper`. Subsequent reads from it will return its default value.
   mutating func clearOptionalBytesWrapper() {_uniqueStorage()._optionalBytesWrapper = nil}
 
-  var repeatedBoolWrapper: [SwiftProtobuf.Google_Protobuf_BoolValue] {
+  var repeatedBoolWrapper: [SwiftProtobufCore.Google_Protobuf_BoolValue] {
     get {return _storage._repeatedBoolWrapper}
     set {_uniqueStorage()._repeatedBoolWrapper = newValue}
   }
 
-  var repeatedInt32Wrapper: [SwiftProtobuf.Google_Protobuf_Int32Value] {
+  var repeatedInt32Wrapper: [SwiftProtobufCore.Google_Protobuf_Int32Value] {
     get {return _storage._repeatedInt32Wrapper}
     set {_uniqueStorage()._repeatedInt32Wrapper = newValue}
   }
 
-  var repeatedInt64Wrapper: [SwiftProtobuf.Google_Protobuf_Int64Value] {
+  var repeatedInt64Wrapper: [SwiftProtobufCore.Google_Protobuf_Int64Value] {
     get {return _storage._repeatedInt64Wrapper}
     set {_uniqueStorage()._repeatedInt64Wrapper = newValue}
   }
 
-  var repeatedUint32Wrapper: [SwiftProtobuf.Google_Protobuf_UInt32Value] {
+  var repeatedUint32Wrapper: [SwiftProtobufCore.Google_Protobuf_UInt32Value] {
     get {return _storage._repeatedUint32Wrapper}
     set {_uniqueStorage()._repeatedUint32Wrapper = newValue}
   }
 
-  var repeatedUint64Wrapper: [SwiftProtobuf.Google_Protobuf_UInt64Value] {
+  var repeatedUint64Wrapper: [SwiftProtobufCore.Google_Protobuf_UInt64Value] {
     get {return _storage._repeatedUint64Wrapper}
     set {_uniqueStorage()._repeatedUint64Wrapper = newValue}
   }
 
-  var repeatedFloatWrapper: [SwiftProtobuf.Google_Protobuf_FloatValue] {
+  var repeatedFloatWrapper: [SwiftProtobufCore.Google_Protobuf_FloatValue] {
     get {return _storage._repeatedFloatWrapper}
     set {_uniqueStorage()._repeatedFloatWrapper = newValue}
   }
 
-  var repeatedDoubleWrapper: [SwiftProtobuf.Google_Protobuf_DoubleValue] {
+  var repeatedDoubleWrapper: [SwiftProtobufCore.Google_Protobuf_DoubleValue] {
     get {return _storage._repeatedDoubleWrapper}
     set {_uniqueStorage()._repeatedDoubleWrapper = newValue}
   }
 
-  var repeatedStringWrapper: [SwiftProtobuf.Google_Protobuf_StringValue] {
+  var repeatedStringWrapper: [SwiftProtobufCore.Google_Protobuf_StringValue] {
     get {return _storage._repeatedStringWrapper}
     set {_uniqueStorage()._repeatedStringWrapper = newValue}
   }
 
-  var repeatedBytesWrapper: [SwiftProtobuf.Google_Protobuf_BytesValue] {
+  var repeatedBytesWrapper: [SwiftProtobufCore.Google_Protobuf_BytesValue] {
     get {return _storage._repeatedBytesWrapper}
     set {_uniqueStorage()._repeatedBytesWrapper = newValue}
   }
 
-  var optionalDuration: SwiftProtobuf.Google_Protobuf_Duration {
-    get {return _storage._optionalDuration ?? SwiftProtobuf.Google_Protobuf_Duration()}
+  var optionalDuration: SwiftProtobufCore.Google_Protobuf_Duration {
+    get {return _storage._optionalDuration ?? SwiftProtobufCore.Google_Protobuf_Duration()}
     set {_uniqueStorage()._optionalDuration = newValue}
   }
   /// Returns true if `optionalDuration` has been explicitly set.
@@ -799,8 +799,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalDuration`. Subsequent reads from it will return its default value.
   mutating func clearOptionalDuration() {_uniqueStorage()._optionalDuration = nil}
 
-  var optionalTimestamp: SwiftProtobuf.Google_Protobuf_Timestamp {
-    get {return _storage._optionalTimestamp ?? SwiftProtobuf.Google_Protobuf_Timestamp()}
+  var optionalTimestamp: SwiftProtobufCore.Google_Protobuf_Timestamp {
+    get {return _storage._optionalTimestamp ?? SwiftProtobufCore.Google_Protobuf_Timestamp()}
     set {_uniqueStorage()._optionalTimestamp = newValue}
   }
   /// Returns true if `optionalTimestamp` has been explicitly set.
@@ -808,8 +808,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalTimestamp`. Subsequent reads from it will return its default value.
   mutating func clearOptionalTimestamp() {_uniqueStorage()._optionalTimestamp = nil}
 
-  var optionalFieldMask: SwiftProtobuf.Google_Protobuf_FieldMask {
-    get {return _storage._optionalFieldMask ?? SwiftProtobuf.Google_Protobuf_FieldMask()}
+  var optionalFieldMask: SwiftProtobufCore.Google_Protobuf_FieldMask {
+    get {return _storage._optionalFieldMask ?? SwiftProtobufCore.Google_Protobuf_FieldMask()}
     set {_uniqueStorage()._optionalFieldMask = newValue}
   }
   /// Returns true if `optionalFieldMask` has been explicitly set.
@@ -817,8 +817,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalFieldMask`. Subsequent reads from it will return its default value.
   mutating func clearOptionalFieldMask() {_uniqueStorage()._optionalFieldMask = nil}
 
-  var optionalStruct: SwiftProtobuf.Google_Protobuf_Struct {
-    get {return _storage._optionalStruct ?? SwiftProtobuf.Google_Protobuf_Struct()}
+  var optionalStruct: SwiftProtobufCore.Google_Protobuf_Struct {
+    get {return _storage._optionalStruct ?? SwiftProtobufCore.Google_Protobuf_Struct()}
     set {_uniqueStorage()._optionalStruct = newValue}
   }
   /// Returns true if `optionalStruct` has been explicitly set.
@@ -826,8 +826,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalStruct`. Subsequent reads from it will return its default value.
   mutating func clearOptionalStruct() {_uniqueStorage()._optionalStruct = nil}
 
-  var optionalAny: SwiftProtobuf.Google_Protobuf_Any {
-    get {return _storage._optionalAny ?? SwiftProtobuf.Google_Protobuf_Any()}
+  var optionalAny: SwiftProtobufCore.Google_Protobuf_Any {
+    get {return _storage._optionalAny ?? SwiftProtobufCore.Google_Protobuf_Any()}
     set {_uniqueStorage()._optionalAny = newValue}
   }
   /// Returns true if `optionalAny` has been explicitly set.
@@ -835,8 +835,8 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalAny`. Subsequent reads from it will return its default value.
   mutating func clearOptionalAny() {_uniqueStorage()._optionalAny = nil}
 
-  var optionalValue: SwiftProtobuf.Google_Protobuf_Value {
-    get {return _storage._optionalValue ?? SwiftProtobuf.Google_Protobuf_Value()}
+  var optionalValue: SwiftProtobufCore.Google_Protobuf_Value {
+    get {return _storage._optionalValue ?? SwiftProtobufCore.Google_Protobuf_Value()}
     set {_uniqueStorage()._optionalValue = newValue}
   }
   /// Returns true if `optionalValue` has been explicitly set.
@@ -844,42 +844,42 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   /// Clears the value of `optionalValue`. Subsequent reads from it will return its default value.
   mutating func clearOptionalValue() {_uniqueStorage()._optionalValue = nil}
 
-  var optionalNullValue: SwiftProtobuf.Google_Protobuf_NullValue {
+  var optionalNullValue: SwiftProtobufCore.Google_Protobuf_NullValue {
     get {return _storage._optionalNullValue}
     set {_uniqueStorage()._optionalNullValue = newValue}
   }
 
-  var repeatedDuration: [SwiftProtobuf.Google_Protobuf_Duration] {
+  var repeatedDuration: [SwiftProtobufCore.Google_Protobuf_Duration] {
     get {return _storage._repeatedDuration}
     set {_uniqueStorage()._repeatedDuration = newValue}
   }
 
-  var repeatedTimestamp: [SwiftProtobuf.Google_Protobuf_Timestamp] {
+  var repeatedTimestamp: [SwiftProtobufCore.Google_Protobuf_Timestamp] {
     get {return _storage._repeatedTimestamp}
     set {_uniqueStorage()._repeatedTimestamp = newValue}
   }
 
-  var repeatedFieldmask: [SwiftProtobuf.Google_Protobuf_FieldMask] {
+  var repeatedFieldmask: [SwiftProtobufCore.Google_Protobuf_FieldMask] {
     get {return _storage._repeatedFieldmask}
     set {_uniqueStorage()._repeatedFieldmask = newValue}
   }
 
-  var repeatedStruct: [SwiftProtobuf.Google_Protobuf_Struct] {
+  var repeatedStruct: [SwiftProtobufCore.Google_Protobuf_Struct] {
     get {return _storage._repeatedStruct}
     set {_uniqueStorage()._repeatedStruct = newValue}
   }
 
-  var repeatedAny: [SwiftProtobuf.Google_Protobuf_Any] {
+  var repeatedAny: [SwiftProtobufCore.Google_Protobuf_Any] {
     get {return _storage._repeatedAny}
     set {_uniqueStorage()._repeatedAny = newValue}
   }
 
-  var repeatedValue: [SwiftProtobuf.Google_Protobuf_Value] {
+  var repeatedValue: [SwiftProtobufCore.Google_Protobuf_Value] {
     get {return _storage._repeatedValue}
     set {_uniqueStorage()._repeatedValue = newValue}
   }
 
-  var repeatedListValue: [SwiftProtobuf.Google_Protobuf_ListValue] {
+  var repeatedListValue: [SwiftProtobufCore.Google_Protobuf_ListValue] {
     get {return _storage._repeatedListValue}
     set {_uniqueStorage()._repeatedListValue = newValue}
   }
@@ -976,7 +976,7 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
     set {_uniqueStorage()._fieldName18__ = newValue}
   }
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   enum OneOf_OneofField: Equatable {
     case oneofUint32(UInt32)
@@ -988,11 +988,11 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
     case oneofFloat(Float)
     case oneofDouble(Double)
     case oneofEnum(ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum)
-    case oneofNullValue(SwiftProtobuf.Google_Protobuf_NullValue)
+    case oneofNullValue(SwiftProtobufCore.Google_Protobuf_NullValue)
 
   }
 
-  enum NestedEnum: SwiftProtobuf.Enum {
+  enum NestedEnum: SwiftProtobufCore.Enum {
     typealias RawValue = Int
     case foo // = 0
     case bar // = 1
@@ -1036,7 +1036,7 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
 
   }
 
-  enum AliasedEnum: SwiftProtobuf.Enum {
+  enum AliasedEnum: SwiftProtobufCore.Enum {
     typealias RawValue = Int
     case aliasFoo // = 0
     case aliasBar // = 1
@@ -1077,7 +1077,7 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
   }
 
   struct NestedMessage {
-    // SwiftProtobuf.Message conformance is added in an extension below. See the
+    // SwiftProtobufCore.Message conformance is added in an extension below. See the
     // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
     // methods supported on all messages.
 
@@ -1095,7 +1095,7 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
     /// Clears the value of `corecursive`. Subsequent reads from it will return its default value.
     mutating func clearCorecursive() {_uniqueStorage()._corecursive = nil}
 
-    var unknownFields = SwiftProtobuf.UnknownStorage()
+    var unknownFields = SwiftProtobufCore.UnknownStorage()
 
     init() {}
 
@@ -1108,35 +1108,35 @@ struct ProtobufTestMessages_Proto3_TestAllTypesProto3 {
 }
 
 struct ProtobufTestMessages_Proto3_ForeignMessage {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   var c: Int32 = 0
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 }
 
 struct ProtobufTestMessages_Proto3_NullHypothesisProto3 {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   init() {}
 }
 
 struct ProtobufTestMessages_Proto3_EnumOnlyProto3 {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  var unknownFields = SwiftProtobuf.UnknownStorage()
+  var unknownFields = SwiftProtobufCore.UnknownStorage()
 
-  enum BoolEnum: SwiftProtobuf.Enum {
+  enum BoolEnum: SwiftProtobufCore.Enum {
     typealias RawValue = Int
     case kFalse // = 0
     case kTrue // = 1
@@ -1186,17 +1186,17 @@ extension ProtobufTestMessages_Proto3_EnumOnlyProto3: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "protobuf_test_messages.proto3"
 
-extension ProtobufTestMessages_Proto3_ForeignEnum: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ProtobufTestMessages_Proto3_ForeignEnum: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "FOREIGN_FOO"),
     1: .same(proto: "FOREIGN_BAR"),
     2: .same(proto: "FOREIGN_BAZ"),
   ]
 }
 
-extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".TestAllTypesProto3"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "optional_int32"),
     2: .standard(proto: "optional_int64"),
     3: .standard(proto: "optional_uint32"),
@@ -1443,38 +1443,38 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     var _mapStringNestedEnum: Dictionary<String,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum> = [:]
     var _mapStringForeignEnum: Dictionary<String,ProtobufTestMessages_Proto3_ForeignEnum> = [:]
     var _oneofField: ProtobufTestMessages_Proto3_TestAllTypesProto3.OneOf_OneofField?
-    var _optionalBoolWrapper: SwiftProtobuf.Google_Protobuf_BoolValue? = nil
-    var _optionalInt32Wrapper: SwiftProtobuf.Google_Protobuf_Int32Value? = nil
-    var _optionalInt64Wrapper: SwiftProtobuf.Google_Protobuf_Int64Value? = nil
-    var _optionalUint32Wrapper: SwiftProtobuf.Google_Protobuf_UInt32Value? = nil
-    var _optionalUint64Wrapper: SwiftProtobuf.Google_Protobuf_UInt64Value? = nil
-    var _optionalFloatWrapper: SwiftProtobuf.Google_Protobuf_FloatValue? = nil
-    var _optionalDoubleWrapper: SwiftProtobuf.Google_Protobuf_DoubleValue? = nil
-    var _optionalStringWrapper: SwiftProtobuf.Google_Protobuf_StringValue? = nil
-    var _optionalBytesWrapper: SwiftProtobuf.Google_Protobuf_BytesValue? = nil
-    var _repeatedBoolWrapper: [SwiftProtobuf.Google_Protobuf_BoolValue] = []
-    var _repeatedInt32Wrapper: [SwiftProtobuf.Google_Protobuf_Int32Value] = []
-    var _repeatedInt64Wrapper: [SwiftProtobuf.Google_Protobuf_Int64Value] = []
-    var _repeatedUint32Wrapper: [SwiftProtobuf.Google_Protobuf_UInt32Value] = []
-    var _repeatedUint64Wrapper: [SwiftProtobuf.Google_Protobuf_UInt64Value] = []
-    var _repeatedFloatWrapper: [SwiftProtobuf.Google_Protobuf_FloatValue] = []
-    var _repeatedDoubleWrapper: [SwiftProtobuf.Google_Protobuf_DoubleValue] = []
-    var _repeatedStringWrapper: [SwiftProtobuf.Google_Protobuf_StringValue] = []
-    var _repeatedBytesWrapper: [SwiftProtobuf.Google_Protobuf_BytesValue] = []
-    var _optionalDuration: SwiftProtobuf.Google_Protobuf_Duration? = nil
-    var _optionalTimestamp: SwiftProtobuf.Google_Protobuf_Timestamp? = nil
-    var _optionalFieldMask: SwiftProtobuf.Google_Protobuf_FieldMask? = nil
-    var _optionalStruct: SwiftProtobuf.Google_Protobuf_Struct? = nil
-    var _optionalAny: SwiftProtobuf.Google_Protobuf_Any? = nil
-    var _optionalValue: SwiftProtobuf.Google_Protobuf_Value? = nil
-    var _optionalNullValue: SwiftProtobuf.Google_Protobuf_NullValue = .nullValue
-    var _repeatedDuration: [SwiftProtobuf.Google_Protobuf_Duration] = []
-    var _repeatedTimestamp: [SwiftProtobuf.Google_Protobuf_Timestamp] = []
-    var _repeatedFieldmask: [SwiftProtobuf.Google_Protobuf_FieldMask] = []
-    var _repeatedStruct: [SwiftProtobuf.Google_Protobuf_Struct] = []
-    var _repeatedAny: [SwiftProtobuf.Google_Protobuf_Any] = []
-    var _repeatedValue: [SwiftProtobuf.Google_Protobuf_Value] = []
-    var _repeatedListValue: [SwiftProtobuf.Google_Protobuf_ListValue] = []
+    var _optionalBoolWrapper: SwiftProtobufCore.Google_Protobuf_BoolValue? = nil
+    var _optionalInt32Wrapper: SwiftProtobufCore.Google_Protobuf_Int32Value? = nil
+    var _optionalInt64Wrapper: SwiftProtobufCore.Google_Protobuf_Int64Value? = nil
+    var _optionalUint32Wrapper: SwiftProtobufCore.Google_Protobuf_UInt32Value? = nil
+    var _optionalUint64Wrapper: SwiftProtobufCore.Google_Protobuf_UInt64Value? = nil
+    var _optionalFloatWrapper: SwiftProtobufCore.Google_Protobuf_FloatValue? = nil
+    var _optionalDoubleWrapper: SwiftProtobufCore.Google_Protobuf_DoubleValue? = nil
+    var _optionalStringWrapper: SwiftProtobufCore.Google_Protobuf_StringValue? = nil
+    var _optionalBytesWrapper: SwiftProtobufCore.Google_Protobuf_BytesValue? = nil
+    var _repeatedBoolWrapper: [SwiftProtobufCore.Google_Protobuf_BoolValue] = []
+    var _repeatedInt32Wrapper: [SwiftProtobufCore.Google_Protobuf_Int32Value] = []
+    var _repeatedInt64Wrapper: [SwiftProtobufCore.Google_Protobuf_Int64Value] = []
+    var _repeatedUint32Wrapper: [SwiftProtobufCore.Google_Protobuf_UInt32Value] = []
+    var _repeatedUint64Wrapper: [SwiftProtobufCore.Google_Protobuf_UInt64Value] = []
+    var _repeatedFloatWrapper: [SwiftProtobufCore.Google_Protobuf_FloatValue] = []
+    var _repeatedDoubleWrapper: [SwiftProtobufCore.Google_Protobuf_DoubleValue] = []
+    var _repeatedStringWrapper: [SwiftProtobufCore.Google_Protobuf_StringValue] = []
+    var _repeatedBytesWrapper: [SwiftProtobufCore.Google_Protobuf_BytesValue] = []
+    var _optionalDuration: SwiftProtobufCore.Google_Protobuf_Duration? = nil
+    var _optionalTimestamp: SwiftProtobufCore.Google_Protobuf_Timestamp? = nil
+    var _optionalFieldMask: SwiftProtobufCore.Google_Protobuf_FieldMask? = nil
+    var _optionalStruct: SwiftProtobufCore.Google_Protobuf_Struct? = nil
+    var _optionalAny: SwiftProtobufCore.Google_Protobuf_Any? = nil
+    var _optionalValue: SwiftProtobufCore.Google_Protobuf_Value? = nil
+    var _optionalNullValue: SwiftProtobufCore.Google_Protobuf_NullValue = .nullValue
+    var _repeatedDuration: [SwiftProtobufCore.Google_Protobuf_Duration] = []
+    var _repeatedTimestamp: [SwiftProtobufCore.Google_Protobuf_Timestamp] = []
+    var _repeatedFieldmask: [SwiftProtobufCore.Google_Protobuf_FieldMask] = []
+    var _repeatedStruct: [SwiftProtobufCore.Google_Protobuf_Struct] = []
+    var _repeatedAny: [SwiftProtobufCore.Google_Protobuf_Any] = []
+    var _repeatedValue: [SwiftProtobufCore.Google_Protobuf_Value] = []
+    var _repeatedListValue: [SwiftProtobufCore.Google_Protobuf_ListValue] = []
     var _fieldname1: Int32 = 0
     var _fieldName2: Int32 = 0
     var _fieldName3: Int32 = 0
@@ -1651,7 +1651,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     return _storage
   }
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     _ = _uniqueStorage()
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       while let fieldNumber = try decoder.nextFieldNumber() {
@@ -1703,25 +1703,25 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
         case 52: try { try decoder.decodeRepeatedEnumField(value: &_storage._repeatedForeignEnum) }()
         case 54: try { try decoder.decodeRepeatedStringField(value: &_storage._repeatedStringPiece) }()
         case 55: try { try decoder.decodeRepeatedStringField(value: &_storage._repeatedCord) }()
-        case 56: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: &_storage._mapInt32Int32) }()
-        case 57: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, value: &_storage._mapInt64Int64) }()
-        case 58: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, value: &_storage._mapUint32Uint32) }()
-        case 59: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, value: &_storage._mapUint64Uint64) }()
-        case 60: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, value: &_storage._mapSint32Sint32) }()
-        case 61: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, value: &_storage._mapSint64Sint64) }()
-        case 62: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, value: &_storage._mapFixed32Fixed32) }()
-        case 63: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, value: &_storage._mapFixed64Fixed64) }()
-        case 64: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, value: &_storage._mapSfixed32Sfixed32) }()
-        case 65: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, value: &_storage._mapSfixed64Sfixed64) }()
-        case 66: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, value: &_storage._mapInt32Float) }()
-        case 67: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, value: &_storage._mapInt32Double) }()
-        case 68: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
-        case 69: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &_storage._mapStringString) }()
-        case 70: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, value: &_storage._mapStringBytes) }()
-        case 71: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage>.self, value: &_storage._mapStringNestedMessage) }()
-        case 72: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_ForeignMessage>.self, value: &_storage._mapStringForeignMessage) }()
-        case 73: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum>.self, value: &_storage._mapStringNestedEnum) }()
-        case 74: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_ForeignEnum>.self, value: &_storage._mapStringForeignEnum) }()
+        case 56: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufInt32>.self, value: &_storage._mapInt32Int32) }()
+        case 57: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt64,SwiftProtobufCore.ProtobufInt64>.self, value: &_storage._mapInt64Int64) }()
+        case 58: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt32,SwiftProtobufCore.ProtobufUInt32>.self, value: &_storage._mapUint32Uint32) }()
+        case 59: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt64,SwiftProtobufCore.ProtobufUInt64>.self, value: &_storage._mapUint64Uint64) }()
+        case 60: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt32,SwiftProtobufCore.ProtobufSInt32>.self, value: &_storage._mapSint32Sint32) }()
+        case 61: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt64,SwiftProtobufCore.ProtobufSInt64>.self, value: &_storage._mapSint64Sint64) }()
+        case 62: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed32,SwiftProtobufCore.ProtobufFixed32>.self, value: &_storage._mapFixed32Fixed32) }()
+        case 63: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed64,SwiftProtobufCore.ProtobufFixed64>.self, value: &_storage._mapFixed64Fixed64) }()
+        case 64: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed32,SwiftProtobufCore.ProtobufSFixed32>.self, value: &_storage._mapSfixed32Sfixed32) }()
+        case 65: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed64,SwiftProtobufCore.ProtobufSFixed64>.self, value: &_storage._mapSfixed64Sfixed64) }()
+        case 66: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufFloat>.self, value: &_storage._mapInt32Float) }()
+        case 67: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufDouble>.self, value: &_storage._mapInt32Double) }()
+        case 68: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufBool,SwiftProtobufCore.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
+        case 69: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufString>.self, value: &_storage._mapStringString) }()
+        case 70: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufBytes>.self, value: &_storage._mapStringBytes) }()
+        case 71: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage>.self, value: &_storage._mapStringNestedMessage) }()
+        case 72: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_ForeignMessage>.self, value: &_storage._mapStringForeignMessage) }()
+        case 73: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum>.self, value: &_storage._mapStringNestedEnum) }()
+        case 74: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_ForeignEnum>.self, value: &_storage._mapStringForeignEnum) }()
         case 75: try { try decoder.decodeRepeatedInt32Field(value: &_storage._packedInt32) }()
         case 76: try { try decoder.decodeRepeatedInt64Field(value: &_storage._packedInt64) }()
         case 77: try { try decoder.decodeRepeatedUInt32Field(value: &_storage._packedUint32) }()
@@ -1828,7 +1828,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
           }
         }()
         case 120: try {
-          var v: SwiftProtobuf.Google_Protobuf_NullValue?
+          var v: SwiftProtobufCore.Google_Protobuf_NullValue?
           try decoder.decodeSingularEnumField(value: &v)
           if let v = v {
             if _storage._oneofField != nil {try decoder.handleConflictingOneOf()}
@@ -1891,7 +1891,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every if/case branch local when no optimizations
@@ -2030,61 +2030,61 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
         try visitor.visitRepeatedStringField(value: _storage._repeatedCord, fieldNumber: 55)
       }
       if !_storage._mapInt32Int32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: _storage._mapInt32Int32, fieldNumber: 56)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufInt32>.self, value: _storage._mapInt32Int32, fieldNumber: 56)
       }
       if !_storage._mapInt64Int64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, value: _storage._mapInt64Int64, fieldNumber: 57)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt64,SwiftProtobufCore.ProtobufInt64>.self, value: _storage._mapInt64Int64, fieldNumber: 57)
       }
       if !_storage._mapUint32Uint32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, value: _storage._mapUint32Uint32, fieldNumber: 58)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt32,SwiftProtobufCore.ProtobufUInt32>.self, value: _storage._mapUint32Uint32, fieldNumber: 58)
       }
       if !_storage._mapUint64Uint64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, value: _storage._mapUint64Uint64, fieldNumber: 59)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufUInt64,SwiftProtobufCore.ProtobufUInt64>.self, value: _storage._mapUint64Uint64, fieldNumber: 59)
       }
       if !_storage._mapSint32Sint32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, value: _storage._mapSint32Sint32, fieldNumber: 60)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt32,SwiftProtobufCore.ProtobufSInt32>.self, value: _storage._mapSint32Sint32, fieldNumber: 60)
       }
       if !_storage._mapSint64Sint64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, value: _storage._mapSint64Sint64, fieldNumber: 61)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSInt64,SwiftProtobufCore.ProtobufSInt64>.self, value: _storage._mapSint64Sint64, fieldNumber: 61)
       }
       if !_storage._mapFixed32Fixed32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, value: _storage._mapFixed32Fixed32, fieldNumber: 62)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed32,SwiftProtobufCore.ProtobufFixed32>.self, value: _storage._mapFixed32Fixed32, fieldNumber: 62)
       }
       if !_storage._mapFixed64Fixed64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, value: _storage._mapFixed64Fixed64, fieldNumber: 63)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufFixed64,SwiftProtobufCore.ProtobufFixed64>.self, value: _storage._mapFixed64Fixed64, fieldNumber: 63)
       }
       if !_storage._mapSfixed32Sfixed32.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, value: _storage._mapSfixed32Sfixed32, fieldNumber: 64)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed32,SwiftProtobufCore.ProtobufSFixed32>.self, value: _storage._mapSfixed32Sfixed32, fieldNumber: 64)
       }
       if !_storage._mapSfixed64Sfixed64.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, value: _storage._mapSfixed64Sfixed64, fieldNumber: 65)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufSFixed64,SwiftProtobufCore.ProtobufSFixed64>.self, value: _storage._mapSfixed64Sfixed64, fieldNumber: 65)
       }
       if !_storage._mapInt32Float.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, value: _storage._mapInt32Float, fieldNumber: 66)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufFloat>.self, value: _storage._mapInt32Float, fieldNumber: 66)
       }
       if !_storage._mapInt32Double.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, value: _storage._mapInt32Double, fieldNumber: 67)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufInt32,SwiftProtobufCore.ProtobufDouble>.self, value: _storage._mapInt32Double, fieldNumber: 67)
       }
       if !_storage._mapBoolBool.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: _storage._mapBoolBool, fieldNumber: 68)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufBool,SwiftProtobufCore.ProtobufBool>.self, value: _storage._mapBoolBool, fieldNumber: 68)
       }
       if !_storage._mapStringString.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: _storage._mapStringString, fieldNumber: 69)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufString>.self, value: _storage._mapStringString, fieldNumber: 69)
       }
       if !_storage._mapStringBytes.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, value: _storage._mapStringBytes, fieldNumber: 70)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMap<SwiftProtobufCore.ProtobufString,SwiftProtobufCore.ProtobufBytes>.self, value: _storage._mapStringBytes, fieldNumber: 70)
       }
       if !_storage._mapStringNestedMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage>.self, value: _storage._mapStringNestedMessage, fieldNumber: 71)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage>.self, value: _storage._mapStringNestedMessage, fieldNumber: 71)
       }
       if !_storage._mapStringForeignMessage.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_ForeignMessage>.self, value: _storage._mapStringForeignMessage, fieldNumber: 72)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_ForeignMessage>.self, value: _storage._mapStringForeignMessage, fieldNumber: 72)
       }
       if !_storage._mapStringNestedEnum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum>.self, value: _storage._mapStringNestedEnum, fieldNumber: 73)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum>.self, value: _storage._mapStringNestedEnum, fieldNumber: 73)
       }
       if !_storage._mapStringForeignEnum.isEmpty {
-        try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto3_ForeignEnum>.self, value: _storage._mapStringForeignEnum, fieldNumber: 74)
+        try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufEnumMap<SwiftProtobufCore.ProtobufString,ProtobufTestMessages_Proto3_ForeignEnum>.self, value: _storage._mapStringForeignEnum, fieldNumber: 74)
       }
       if !_storage._packedInt32.isEmpty {
         try visitor.visitPackedInt32Field(value: _storage._packedInt32, fieldNumber: 75)
@@ -2523,8 +2523,8 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
   }
 }
 
-extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     -1: .same(proto: "NEG"),
     0: .same(proto: "FOO"),
     1: .same(proto: "BAR"),
@@ -2532,17 +2532,17 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedEnum: SwiftProtob
   ]
 }
 
-extension ProtobufTestMessages_Proto3_TestAllTypesProto3.AliasedEnum: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ProtobufTestMessages_Proto3_TestAllTypesProto3.AliasedEnum: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "ALIAS_FOO"),
     1: .same(proto: "ALIAS_BAR"),
     2: .aliased(proto: "ALIAS_BAZ", aliases: ["MOO", "moo", "bAz"]),
   ]
 }
 
-extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = ProtobufTestMessages_Proto3_TestAllTypesProto3.protoMessageName + ".NestedMessage"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "a"),
     2: .same(proto: "corecursive"),
   ]
@@ -2568,7 +2568,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftPro
     return _storage
   }
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     _ = _uniqueStorage()
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       while let fieldNumber = try decoder.nextFieldNumber() {
@@ -2584,7 +2584,7 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftPro
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every if/case branch local when no optimizations
@@ -2616,13 +2616,13 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftPro
   }
 }
 
-extension ProtobufTestMessages_Proto3_ForeignMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto3_ForeignMessage: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".ForeignMessage"
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "c"),
   ]
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -2634,7 +2634,7 @@ extension ProtobufTestMessages_Proto3_ForeignMessage: SwiftProtobuf.Message, Swi
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.c != 0 {
       try visitor.visitSingularInt32Field(value: self.c, fieldNumber: 1)
     }
@@ -2648,16 +2648,16 @@ extension ProtobufTestMessages_Proto3_ForeignMessage: SwiftProtobuf.Message, Swi
   }
 }
 
-extension ProtobufTestMessages_Proto3_NullHypothesisProto3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto3_NullHypothesisProto3: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".NullHypothesisProto3"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+  static let _protobuf_nameMap = SwiftProtobufCore._NameMap()
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let _ = try decoder.nextFieldNumber() {
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try unknownFields.traverse(visitor: &visitor)
   }
 
@@ -2667,16 +2667,16 @@ extension ProtobufTestMessages_Proto3_NullHypothesisProto3: SwiftProtobuf.Messag
   }
 }
 
-extension ProtobufTestMessages_Proto3_EnumOnlyProto3: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension ProtobufTestMessages_Proto3_EnumOnlyProto3: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   static let protoMessageName: String = _protobuf_package + ".EnumOnlyProto3"
-  static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+  static let _protobuf_nameMap = SwiftProtobufCore._NameMap()
 
-  mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let _ = try decoder.nextFieldNumber() {
     }
   }
 
-  func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try unknownFields.traverse(visitor: &visitor)
   }
 
@@ -2686,8 +2686,8 @@ extension ProtobufTestMessages_Proto3_EnumOnlyProto3: SwiftProtobuf.Message, Swi
   }
 }
 
-extension ProtobufTestMessages_Proto3_EnumOnlyProto3.BoolEnum: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension ProtobufTestMessages_Proto3_EnumOnlyProto3.BoolEnum: SwiftProtobufCore._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "kFalse"),
     1: .same(proto: "kTrue"),
   ]

Sources/SwiftProtobuf/Exports.swift

@@ -0,0 +1,2 @@
+@_exported import SwiftProtobufCore
+@_exported import SwiftProtobufFoundationCompat

Sources/SwiftProtobuf/CMakeLists.txt → Sources/SwiftProtobufCore/CMakeLists.txt

@@ -92,7 +92,7 @@ install(TARGETS SwiftProtobuf
   RUNTIME DESTINATION bin)
 get_swift_host_arch(swift_arch)
 install(FILES
-  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobuf.swiftdoc
-  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobuf.swiftmodule
+  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobufCore.swiftdoc
+  $<TARGET_PROPERTY:SwiftProtobuf,Swift_MODULE_DIRECTORY>/SwiftProtobufCore.swiftmodule
   DESTINATION lib/swift$<$<NOT:$<BOOL:${BUILD_SHARED_LIBS}>>:_static>/$<LOWER_CASE:${CMAKE_SYSTEM_NAME}>/${swift_arch})
 set_property(GLOBAL APPEND PROPERTY Protobuf_EXPORTS SwiftProtobuf)

Sources/SwiftProtobuf/Docs.docc/API.md → Sources/SwiftProtobufCore/Docs.docc/API.md

@@ -13,7 +13,7 @@ They're collected here to make it easier to understand.
 ## Message API
 
 Messages in the input proto file generate Swift structs in the result.
-These structs conform to `SwiftProtobuf.Message` and provide Swift properties for every
+These structs conform to `SwiftProtobufCore.Message` and provide Swift properties for every
 field, basic information about the message, standard initializers, and
 serialization and deserialization methods.
 
@@ -38,13 +38,13 @@ in the library, and omits many details of the generated
 code that are intended purely for internal use by the library.)
 
 ```swift
-public struct Example: SwiftProtobuf.Message {
+public struct Example: SwiftProtobufCore.Message {
   // The generated struct carries constant properties reflecting
   // basic information about the message:
   public var protoMessageName: String {return "Example"}
 
   // Nested enum and message types are nested in the generated Swift
-  public enum E: SwiftProtobuf.Enum { ... }
+  public enum E: SwiftProtobufCore.Enum { ... }
 
   // A public property is created for each field in the proto.
   public var field1: Int32 { get set }
@@ -152,7 +152,7 @@ generator to emit a `struct IntMessage` to the generated Swift file.
 ## Enum API
 
 Proto enums are translated to Swift enums in a fairly straightforward manner.
-The resulting Swift enums conform to the `SwiftProtobuf.Enum` protocol which extends
+The resulting Swift enums conform to the `SwiftProtobufCore.Enum` protocol which extends
 `RawRepresentable` with a `RawValue` of `Int`.
 The generated Swift enum will have a case for each enum value in the proto file.
 
@@ -168,7 +168,7 @@ If deserialization encounters an unknown value:
 - For protobuf binary, the value is handled as an unknown field.
 
 ```swift
-public enum MyEnum: SwiftProtobuf.Enum {
+public enum MyEnum: SwiftProtobufCore.Enum {
     public typealias RawValue = Int
 
     // Case for each value
@@ -280,14 +280,14 @@ Types in the proto file are mapped to Swift types as follows:
 
 Enums in the proto file generate Int-valued enums in the Swift code.
 
-Groups in the proto file generate Swift structs that conform to `SwiftProtobuf.Message`.
+Groups in the proto file generate Swift structs that conform to `SwiftProtobufCore.Message`.
 
 Messages in the proto file generate Swift structs that conform to
-`SwiftProtobuf.Message`.
+`SwiftProtobufCore.Message`.
 
-Note: There is also a `SwiftProtobuf._MessageImplementationBase`
+Note: There is also a `SwiftProtobufCore._MessageImplementationBase`
 protocol.  You should not refer to that directly; use
-`SwiftProtobuf.Message` when you need to work with arbitrary groups or
+`SwiftProtobufCore.Message` when you need to work with arbitrary groups or
 messages.
 
 ### Type modifiers
@@ -397,7 +397,7 @@ Also note that you can access the `alternatives` property here
 directly if you want to use a `switch` construct to analyze
 the fields contained in the oneof:
 ```swift
-public struct ExampleOneOf: SwiftProtobuf.Message {
+public struct ExampleOneOf: SwiftProtobufCore.Message {
    enum OneOf_Alternatives {
    case id(Int32)
    case name(String)
@@ -459,7 +459,7 @@ convenience methods.  The variations from the default generated behavior are des
 
 For most of these types, you should refer to Google's documentation.
 Details are provided here to explain details of how these are
-implemented by SwiftProtobuf.
+implemented by SwiftProtobufCore.
 
 ### Google_Protobuf_Value, Google_Protobuf_Struct, Google_Protobuf_ArrayValue
 

Sources/SwiftProtobuf/Enum.swift → Sources/SwiftProtobufCore/Enum.swift

@@ -8,7 +8,7 @@
 //
 // -----------------------------------------------------------------------------
 ///
-/// Generated enums conform to SwiftProtobuf.Enum
+/// Generated enums conform to SwiftProtobufCore.Enum
 ///
 /// See ProtobufTypes and JSONTypes for extension
 /// methods to support binary and JSON coding.

Sources/SwiftProtobuf/FieldTypes.swift → Sources/SwiftProtobufCore/FieldTypes.swift

@@ -54,7 +54,7 @@ public protocol FieldType {
 public protocol MapKeyType: FieldType {
     /// A comparision function for where order is needed.  Can't use `Comparable`
     /// because `Bool` doesn't conform, and since it is `public` there is no way
-    /// to add a conformance internal to SwiftProtobuf.
+    /// to add a conformance internal to SwiftProtobufCore.
     static func _lessThan(lhs: BaseType, rhs: BaseType) -> Bool
 }
 

Sources/SwiftProtobuf/Message.swift → Sources/SwiftProtobufCore/Message.swift

@@ -175,9 +175,9 @@ extension Message {
 
 /// Implementation base for all messages; not intended for client use.
 ///
-/// In general, use `SwiftProtobuf.Message` instead when you need a variable or
+/// In general, use `SwiftProtobufCore.Message` instead when you need a variable or
 /// argument that can hold any type of message. Occasionally, you can use
-/// `SwiftProtobuf.Message & Equatable` or `SwiftProtobuf.Message & Hashable` as
+/// `SwiftProtobufCore.Message & Equatable` or `SwiftProtobufCore.Message & Hashable` as
 /// generic constraints if you need to write generic code that can be applied to
 /// multiple message types that uses equality tests, puts messages in a `Set`,
 /// or uses them as `Dictionary` keys.

Sources/SwiftProtobuf/any.pb.swift → Sources/SwiftProtobufCore/any.pb.swift

@@ -44,8 +44,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -131,7 +131,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 ///       "value": "1.212s"
 ///     }
 public struct Google_Protobuf_Any {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -173,7 +173,7 @@ public struct Google_Protobuf_Any {
     set {_uniqueStorage()._value = newValue}
   }
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 
@@ -188,9 +188,9 @@ extension Google_Protobuf_Any: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_Any: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Any: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Any"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "type_url"),
     2: .same(proto: "value"),
   ]
@@ -204,7 +204,7 @@ extension Google_Protobuf_Any: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
     return _storage
   }
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     _ = _uniqueStorage()
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       while let fieldNumber = try decoder.nextFieldNumber() {
@@ -220,7 +220,7 @@ extension Google_Protobuf_Any: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
       try _storage.preTraverse()
       if !_storage._typeURL.isEmpty {

Sources/SwiftProtobuf/api.pb.swift → Sources/SwiftProtobufCore/api.pb.swift

@@ -44,8 +44,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -59,7 +59,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 /// this message itself. See https://cloud.google.com/apis/design/glossary for
 /// detailed terminology.
 public struct Google_Protobuf_Api {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -111,7 +111,7 @@ public struct Google_Protobuf_Api {
   /// The source syntax of the service.
   public var syntax: Google_Protobuf_Syntax = .proto2
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 
@@ -120,7 +120,7 @@ public struct Google_Protobuf_Api {
 
 /// Method represents a method of an API interface.
 public struct Google_Protobuf_Method {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -145,7 +145,7 @@ public struct Google_Protobuf_Method {
   /// The source syntax of this method.
   public var syntax: Google_Protobuf_Syntax = .proto2
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -229,7 +229,7 @@ public struct Google_Protobuf_Method {
 ///       ...
 ///     }
 public struct Google_Protobuf_Mixin {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -240,7 +240,7 @@ public struct Google_Protobuf_Mixin {
   /// are rooted.
   public var root: String = String()
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -255,9 +255,9 @@ extension Google_Protobuf_Mixin: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_Api: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Api: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Api"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "name"),
     2: .same(proto: "methods"),
     3: .same(proto: "options"),
@@ -267,7 +267,7 @@ extension Google_Protobuf_Api: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
     7: .same(proto: "syntax"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -285,7 +285,7 @@ extension Google_Protobuf_Api: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -327,9 +327,9 @@ extension Google_Protobuf_Api: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
   }
 }
 
-extension Google_Protobuf_Method: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Method: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Method"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "name"),
     2: .standard(proto: "request_type_url"),
     3: .standard(proto: "request_streaming"),
@@ -339,7 +339,7 @@ extension Google_Protobuf_Method: SwiftProtobuf.Message, SwiftProtobuf._MessageI
     7: .same(proto: "syntax"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -357,7 +357,7 @@ extension Google_Protobuf_Method: SwiftProtobuf.Message, SwiftProtobuf._MessageI
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.name.isEmpty {
       try visitor.visitSingularStringField(value: self.name, fieldNumber: 1)
     }
@@ -395,14 +395,14 @@ extension Google_Protobuf_Method: SwiftProtobuf.Message, SwiftProtobuf._MessageI
   }
 }
 
-extension Google_Protobuf_Mixin: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Mixin: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Mixin"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "name"),
     2: .same(proto: "root"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -415,7 +415,7 @@ extension Google_Protobuf_Mixin: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.name.isEmpty {
       try visitor.visitSingularStringField(value: self.name, fieldNumber: 1)
     }

Sources/SwiftProtobuf/duration.pb.swift → Sources/SwiftProtobufCore/duration.pb.swift

@@ -44,8 +44,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -108,7 +108,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 /// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
 /// microsecond should be expressed in JSON format as "3.000001s".
 public struct Google_Protobuf_Duration {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -125,7 +125,7 @@ public struct Google_Protobuf_Duration {
   /// to +999,999,999 inclusive.
   public var nanos: Int32 = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -138,14 +138,14 @@ extension Google_Protobuf_Duration: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_Duration: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Duration: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Duration"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "seconds"),
     2: .same(proto: "nanos"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -158,7 +158,7 @@ extension Google_Protobuf_Duration: SwiftProtobuf.Message, SwiftProtobuf._Messag
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.seconds != 0 {
       try visitor.visitSingularInt64Field(value: self.seconds, fieldNumber: 1)
     }

Sources/SwiftProtobuf/empty.pb.swift → Sources/SwiftProtobufCore/empty.pb.swift

@@ -44,8 +44,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -57,11 +57,11 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 ///       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
 ///     }
 public struct Google_Protobuf_Empty {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -74,16 +74,16 @@ extension Google_Protobuf_Empty: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_Empty: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Empty: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Empty"
-  public static let _protobuf_nameMap = SwiftProtobuf._NameMap()
+  public static let _protobuf_nameMap = SwiftProtobufCore._NameMap()
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let _ = try decoder.nextFieldNumber() {
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     try unknownFields.traverse(visitor: &visitor)
   }
 

Sources/SwiftProtobuf/field_mask.pb.swift → Sources/SwiftProtobufCore/field_mask.pb.swift

@@ -44,8 +44,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -249,14 +249,14 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 /// request should verify the included field paths, and return an
 /// `INVALID_ARGUMENT` error if any path is unmappable.
 public struct Google_Protobuf_FieldMask {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The set of field mask paths.
   public var paths: [String] = []
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -269,13 +269,13 @@ extension Google_Protobuf_FieldMask: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_FieldMask: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_FieldMask: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".FieldMask"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "paths"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -287,7 +287,7 @@ extension Google_Protobuf_FieldMask: SwiftProtobuf.Message, SwiftProtobuf._Messa
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.paths.isEmpty {
       try visitor.visitRepeatedStringField(value: self.paths, fieldNumber: 1)
     }

Sources/SwiftProtobuf/source_context.pb.swift → Sources/SwiftProtobufCore/source_context.pb.swift

@@ -44,15 +44,15 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
 /// `SourceContext` represents information about the source of a
 /// protobuf element, like the file in which it is defined.
 public struct Google_Protobuf_SourceContext {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -60,7 +60,7 @@ public struct Google_Protobuf_SourceContext {
   /// protobuf element.  For example: `"google/protobuf/source_context.proto"`.
   public var fileName: String = String()
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -73,13 +73,13 @@ extension Google_Protobuf_SourceContext: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_SourceContext: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_SourceContext: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".SourceContext"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "file_name"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -91,7 +91,7 @@ extension Google_Protobuf_SourceContext: SwiftProtobuf.Message, SwiftProtobuf._M
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.fileName.isEmpty {
       try visitor.visitSingularStringField(value: self.fileName, fieldNumber: 1)
     }

Sources/SwiftProtobuf/struct.pb.swift → Sources/SwiftProtobufCore/struct.pb.swift

@@ -44,8 +44,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -53,7 +53,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 /// `Value` type union.
 ///
 ///  The JSON representation for `NullValue` is JSON `null`.
-public enum Google_Protobuf_NullValue: SwiftProtobuf.Enum {
+public enum Google_Protobuf_NullValue: SwiftProtobufCore.Enum {
   public typealias RawValue = Int
 
   /// Null value.
@@ -94,14 +94,14 @@ public enum Google_Protobuf_NullValue: SwiftProtobuf.Enum {
 ///
 /// The JSON representation for `Struct` is JSON object.
 public struct Google_Protobuf_Struct {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// Unordered map of dynamically typed values.
   public var fields: Dictionary<String,Google_Protobuf_Value> = [:]
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -113,7 +113,7 @@ public struct Google_Protobuf_Struct {
 ///
 /// The JSON representation for `Value` is JSON value.
 public struct Google_Protobuf_Value {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -174,7 +174,7 @@ public struct Google_Protobuf_Value {
     set {kind = .listValue(newValue)}
   }
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   /// The kind of value.
   public enum OneOf_Kind: Equatable {
@@ -200,14 +200,14 @@ public struct Google_Protobuf_Value {
 ///
 /// The JSON representation for `ListValue` is JSON array.
 public struct Google_Protobuf_ListValue {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// Repeated field of dynamically typed values.
   public var values: [Google_Protobuf_Value] = []
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -223,33 +223,33 @@ extension Google_Protobuf_ListValue: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_NullValue: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension Google_Protobuf_NullValue: SwiftProtobufCore._ProtoNameProviding {
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "NULL_VALUE"),
   ]
 }
 
-extension Google_Protobuf_Struct: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Struct: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Struct"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "fields"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Google_Protobuf_Value>.self, value: &self.fields) }()
+      case 1: try { try decoder.decodeMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,Google_Protobuf_Value>.self, value: &self.fields) }()
       default: break
       }
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.fields.isEmpty {
-      try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,Google_Protobuf_Value>.self, value: self.fields, fieldNumber: 1)
+      try visitor.visitMapField(fieldType: SwiftProtobufCore._ProtobufMessageMap<SwiftProtobufCore.ProtobufString,Google_Protobuf_Value>.self, value: self.fields, fieldNumber: 1)
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -261,9 +261,9 @@ extension Google_Protobuf_Struct: SwiftProtobuf.Message, SwiftProtobuf._MessageI
   }
 }
 
-extension Google_Protobuf_Value: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Value: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Value"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .standard(proto: "null_value"),
     2: .standard(proto: "number_value"),
     3: .standard(proto: "string_value"),
@@ -272,7 +272,7 @@ extension Google_Protobuf_Value: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
     6: .standard(proto: "list_value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -341,7 +341,7 @@ extension Google_Protobuf_Value: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -383,13 +383,13 @@ extension Google_Protobuf_Value: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
   }
 }
 
-extension Google_Protobuf_ListValue: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_ListValue: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".ListValue"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "values"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -401,7 +401,7 @@ extension Google_Protobuf_ListValue: SwiftProtobuf.Message, SwiftProtobuf._Messa
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.values.isEmpty {
       try visitor.visitRepeatedMessageField(value: self.values, fieldNumber: 1)
     }

Sources/SwiftProtobuf/timestamp.pb.swift → Sources/SwiftProtobufCore/timestamp.pb.swift

@@ -44,8 +44,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -139,7 +139,7 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 /// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
 /// ) to obtain a formatter capable of generating timestamps in this format.
 public struct Google_Protobuf_Timestamp {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -154,7 +154,7 @@ public struct Google_Protobuf_Timestamp {
   /// inclusive.
   public var nanos: Int32 = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -167,14 +167,14 @@ extension Google_Protobuf_Timestamp: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_Timestamp: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Timestamp: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Timestamp"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "seconds"),
     2: .same(proto: "nanos"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -187,7 +187,7 @@ extension Google_Protobuf_Timestamp: SwiftProtobuf.Message, SwiftProtobuf._Messa
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.seconds != 0 {
       try visitor.visitSingularInt64Field(value: self.seconds, fieldNumber: 1)
     }

Sources/SwiftProtobuf/type.pb.swift → Sources/SwiftProtobufCore/type.pb.swift

@@ -44,13 +44,13 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
 /// The syntax in which a protocol buffer element is defined.
-public enum Google_Protobuf_Syntax: SwiftProtobuf.Enum {
+public enum Google_Protobuf_Syntax: SwiftProtobufCore.Enum {
   public typealias RawValue = Int
 
   /// Syntax `proto2`.
@@ -90,7 +90,7 @@ public enum Google_Protobuf_Syntax: SwiftProtobuf.Enum {
 
 /// A protocol buffer message type.
 public struct Google_Protobuf_Type {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -119,7 +119,7 @@ public struct Google_Protobuf_Type {
   /// The source syntax.
   public var syntax: Google_Protobuf_Syntax = .proto2
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 
@@ -128,7 +128,7 @@ public struct Google_Protobuf_Type {
 
 /// A single field of a message type.
 public struct Google_Protobuf_Field {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -164,10 +164,10 @@ public struct Google_Protobuf_Field {
   /// The string value of the default value of this field. Proto2 syntax only.
   public var defaultValue: String = String()
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   /// Basic field types.
-  public enum Kind: SwiftProtobuf.Enum {
+  public enum Kind: SwiftProtobufCore.Enum {
     public typealias RawValue = Int
 
     /// Field type unknown.
@@ -308,7 +308,7 @@ public struct Google_Protobuf_Field {
   }
 
   /// Whether a field is optional, required, or repeated.
-  public enum Cardinality: SwiftProtobuf.Enum {
+  public enum Cardinality: SwiftProtobufCore.Enum {
     public typealias RawValue = Int
 
     /// For fields with unknown cardinality.
@@ -363,7 +363,7 @@ public struct Google_Protobuf_Field {
 
 /// Enum type definition.
 public struct Google_Protobuf_Enum {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -389,7 +389,7 @@ public struct Google_Protobuf_Enum {
   /// The source syntax.
   public var syntax: Google_Protobuf_Syntax = .proto2
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 
@@ -398,7 +398,7 @@ public struct Google_Protobuf_Enum {
 
 /// Enum value definition.
 public struct Google_Protobuf_EnumValue {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -411,7 +411,7 @@ public struct Google_Protobuf_EnumValue {
   /// Protocol buffer options.
   public var options: [Google_Protobuf_Option] = []
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -419,7 +419,7 @@ public struct Google_Protobuf_EnumValue {
 /// A protocol buffer option, which can be attached to a message, field,
 /// enumeration, etc.
 public struct Google_Protobuf_Option {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
@@ -442,7 +442,7 @@ public struct Google_Protobuf_Option {
   /// Clears the value of `value`. Subsequent reads from it will return its default value.
   public mutating func clearValue() {self._value = nil}
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 
@@ -461,16 +461,16 @@ extension Google_Protobuf_Option: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_Syntax: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension Google_Protobuf_Syntax: SwiftProtobufCore._ProtoNameProviding {
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "SYNTAX_PROTO2"),
     1: .same(proto: "SYNTAX_PROTO3"),
   ]
 }
 
-extension Google_Protobuf_Type: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Type: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Type"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "name"),
     2: .same(proto: "fields"),
     3: .same(proto: "oneofs"),
@@ -479,7 +479,7 @@ extension Google_Protobuf_Type: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
     6: .same(proto: "syntax"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -496,7 +496,7 @@ extension Google_Protobuf_Type: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -534,9 +534,9 @@ extension Google_Protobuf_Type: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
   }
 }
 
-extension Google_Protobuf_Field: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Field: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Field"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "kind"),
     2: .same(proto: "cardinality"),
     3: .same(proto: "number"),
@@ -549,7 +549,7 @@ extension Google_Protobuf_Field: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
     11: .standard(proto: "default_value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -570,7 +570,7 @@ extension Google_Protobuf_Field: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.kind != .typeUnknown {
       try visitor.visitSingularEnumField(value: self.kind, fieldNumber: 1)
     }
@@ -620,8 +620,8 @@ extension Google_Protobuf_Field: SwiftProtobuf.Message, SwiftProtobuf._MessageIm
   }
 }
 
-extension Google_Protobuf_Field.Kind: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension Google_Protobuf_Field.Kind: SwiftProtobufCore._ProtoNameProviding {
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "TYPE_UNKNOWN"),
     1: .same(proto: "TYPE_DOUBLE"),
     2: .same(proto: "TYPE_FLOAT"),
@@ -644,8 +644,8 @@ extension Google_Protobuf_Field.Kind: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension Google_Protobuf_Field.Cardinality: SwiftProtobuf._ProtoNameProviding {
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+extension Google_Protobuf_Field.Cardinality: SwiftProtobufCore._ProtoNameProviding {
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     0: .same(proto: "CARDINALITY_UNKNOWN"),
     1: .same(proto: "CARDINALITY_OPTIONAL"),
     2: .same(proto: "CARDINALITY_REQUIRED"),
@@ -653,9 +653,9 @@ extension Google_Protobuf_Field.Cardinality: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
-extension Google_Protobuf_Enum: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Enum: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Enum"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "name"),
     2: .same(proto: "enumvalue"),
     3: .same(proto: "options"),
@@ -663,7 +663,7 @@ extension Google_Protobuf_Enum: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
     5: .same(proto: "syntax"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -679,7 +679,7 @@ extension Google_Protobuf_Enum: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
@@ -713,15 +713,15 @@ extension Google_Protobuf_Enum: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
   }
 }
 
-extension Google_Protobuf_EnumValue: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_EnumValue: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".EnumValue"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "name"),
     2: .same(proto: "number"),
     3: .same(proto: "options"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -735,7 +735,7 @@ extension Google_Protobuf_EnumValue: SwiftProtobuf.Message, SwiftProtobuf._Messa
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.name.isEmpty {
       try visitor.visitSingularStringField(value: self.name, fieldNumber: 1)
     }
@@ -757,14 +757,14 @@ extension Google_Protobuf_EnumValue: SwiftProtobuf.Message, SwiftProtobuf._Messa
   }
 }
 
-extension Google_Protobuf_Option: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Option: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Option"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "name"),
     2: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -777,7 +777,7 @@ extension Google_Protobuf_Option: SwiftProtobuf.Message, SwiftProtobuf._MessageI
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     // The use of inline closures is to circumvent an issue where the compiler
     // allocates stack space for every if/case branch local when no optimizations
     // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and

Sources/SwiftProtobuf/wrappers.pb.swift → Sources/SwiftProtobufCore/wrappers.pb.swift

@@ -54,8 +54,8 @@ import Foundation
 // incompatible with the version of SwiftProtobuf to which you are linking.
 // Please ensure that you are building against the same version of the API
 // that was used to generate this file.
-fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAPIVersionCheck {
-  struct _3: SwiftProtobuf.ProtobufAPIVersion_3 {}
+fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobufCore.ProtobufAPIVersionCheck {
+  struct _3: SwiftProtobufCore.ProtobufAPIVersion_3 {}
   typealias Version = _3
 }
 
@@ -63,14 +63,14 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 ///
 /// The JSON representation for `DoubleValue` is JSON number.
 public struct Google_Protobuf_DoubleValue {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The double value.
   public var value: Double = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -79,14 +79,14 @@ public struct Google_Protobuf_DoubleValue {
 ///
 /// The JSON representation for `FloatValue` is JSON number.
 public struct Google_Protobuf_FloatValue {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The float value.
   public var value: Float = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -95,14 +95,14 @@ public struct Google_Protobuf_FloatValue {
 ///
 /// The JSON representation for `Int64Value` is JSON string.
 public struct Google_Protobuf_Int64Value {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The int64 value.
   public var value: Int64 = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -111,14 +111,14 @@ public struct Google_Protobuf_Int64Value {
 ///
 /// The JSON representation for `UInt64Value` is JSON string.
 public struct Google_Protobuf_UInt64Value {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The uint64 value.
   public var value: UInt64 = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -127,14 +127,14 @@ public struct Google_Protobuf_UInt64Value {
 ///
 /// The JSON representation for `Int32Value` is JSON number.
 public struct Google_Protobuf_Int32Value {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The int32 value.
   public var value: Int32 = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -143,14 +143,14 @@ public struct Google_Protobuf_Int32Value {
 ///
 /// The JSON representation for `UInt32Value` is JSON number.
 public struct Google_Protobuf_UInt32Value {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The uint32 value.
   public var value: UInt32 = 0
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -159,14 +159,14 @@ public struct Google_Protobuf_UInt32Value {
 ///
 /// The JSON representation for `BoolValue` is JSON `true` and `false`.
 public struct Google_Protobuf_BoolValue {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The bool value.
   public var value: Bool = false
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -175,14 +175,14 @@ public struct Google_Protobuf_BoolValue {
 ///
 /// The JSON representation for `StringValue` is JSON string.
 public struct Google_Protobuf_StringValue {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The string value.
   public var value: String = String()
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -191,14 +191,14 @@ public struct Google_Protobuf_StringValue {
 ///
 /// The JSON representation for `BytesValue` is JSON string.
 public struct Google_Protobuf_BytesValue {
-  // SwiftProtobuf.Message conformance is added in an extension below. See the
+  // SwiftProtobufCore.Message conformance is added in an extension below. See the
   // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
   // methods supported on all messages.
 
   /// The bytes value.
   public var value: Data = Data()
 
-  public var unknownFields = SwiftProtobuf.UnknownStorage()
+  public var unknownFields = SwiftProtobufCore.UnknownStorage()
 
   public init() {}
 }
@@ -219,13 +219,13 @@ extension Google_Protobuf_BytesValue: @unchecked Sendable {}
 
 fileprivate let _protobuf_package = "google.protobuf"
 
-extension Google_Protobuf_DoubleValue: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_DoubleValue: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".DoubleValue"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -237,7 +237,7 @@ extension Google_Protobuf_DoubleValue: SwiftProtobuf.Message, SwiftProtobuf._Mes
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.value != 0 {
       try visitor.visitSingularDoubleField(value: self.value, fieldNumber: 1)
     }
@@ -251,13 +251,13 @@ extension Google_Protobuf_DoubleValue: SwiftProtobuf.Message, SwiftProtobuf._Mes
   }
 }
 
-extension Google_Protobuf_FloatValue: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_FloatValue: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".FloatValue"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -269,7 +269,7 @@ extension Google_Protobuf_FloatValue: SwiftProtobuf.Message, SwiftProtobuf._Mess
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.value != 0 {
       try visitor.visitSingularFloatField(value: self.value, fieldNumber: 1)
     }
@@ -283,13 +283,13 @@ extension Google_Protobuf_FloatValue: SwiftProtobuf.Message, SwiftProtobuf._Mess
   }
 }
 
-extension Google_Protobuf_Int64Value: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Int64Value: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Int64Value"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -301,7 +301,7 @@ extension Google_Protobuf_Int64Value: SwiftProtobuf.Message, SwiftProtobuf._Mess
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.value != 0 {
       try visitor.visitSingularInt64Field(value: self.value, fieldNumber: 1)
     }
@@ -315,13 +315,13 @@ extension Google_Protobuf_Int64Value: SwiftProtobuf.Message, SwiftProtobuf._Mess
   }
 }
 
-extension Google_Protobuf_UInt64Value: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_UInt64Value: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".UInt64Value"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -333,7 +333,7 @@ extension Google_Protobuf_UInt64Value: SwiftProtobuf.Message, SwiftProtobuf._Mes
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.value != 0 {
       try visitor.visitSingularUInt64Field(value: self.value, fieldNumber: 1)
     }
@@ -347,13 +347,13 @@ extension Google_Protobuf_UInt64Value: SwiftProtobuf.Message, SwiftProtobuf._Mes
   }
 }
 
-extension Google_Protobuf_Int32Value: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_Int32Value: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".Int32Value"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -365,7 +365,7 @@ extension Google_Protobuf_Int32Value: SwiftProtobuf.Message, SwiftProtobuf._Mess
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.value != 0 {
       try visitor.visitSingularInt32Field(value: self.value, fieldNumber: 1)
     }
@@ -379,13 +379,13 @@ extension Google_Protobuf_Int32Value: SwiftProtobuf.Message, SwiftProtobuf._Mess
   }
 }
 
-extension Google_Protobuf_UInt32Value: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_UInt32Value: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".UInt32Value"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -397,7 +397,7 @@ extension Google_Protobuf_UInt32Value: SwiftProtobuf.Message, SwiftProtobuf._Mes
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.value != 0 {
       try visitor.visitSingularUInt32Field(value: self.value, fieldNumber: 1)
     }
@@ -411,13 +411,13 @@ extension Google_Protobuf_UInt32Value: SwiftProtobuf.Message, SwiftProtobuf._Mes
   }
 }
 
-extension Google_Protobuf_BoolValue: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_BoolValue: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".BoolValue"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -429,7 +429,7 @@ extension Google_Protobuf_BoolValue: SwiftProtobuf.Message, SwiftProtobuf._Messa
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if self.value != false {
       try visitor.visitSingularBoolField(value: self.value, fieldNumber: 1)
     }
@@ -443,13 +443,13 @@ extension Google_Protobuf_BoolValue: SwiftProtobuf.Message, SwiftProtobuf._Messa
   }
 }
 
-extension Google_Protobuf_StringValue: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_StringValue: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".StringValue"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -461,7 +461,7 @@ extension Google_Protobuf_StringValue: SwiftProtobuf.Message, SwiftProtobuf._Mes
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.value.isEmpty {
       try visitor.visitSingularStringField(value: self.value, fieldNumber: 1)
     }
@@ -475,13 +475,13 @@ extension Google_Protobuf_StringValue: SwiftProtobuf.Message, SwiftProtobuf._Mes
   }
 }
 
-extension Google_Protobuf_BytesValue: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+extension Google_Protobuf_BytesValue: SwiftProtobufCore.Message, SwiftProtobufCore._MessageImplementationBase, SwiftProtobufCore._ProtoNameProviding {
   public static let protoMessageName: String = _protobuf_package + ".BytesValue"
-  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+  public static let _protobuf_nameMap: SwiftProtobufCore._NameMap = [
     1: .same(proto: "value"),
   ]
 
-  public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+  public mutating func decodeMessage<D: SwiftProtobufCore.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
       // The use of inline closures is to circumvent an issue where the compiler
       // allocates stack space for every case branch when no optimizations are
@@ -493,7 +493,7 @@ extension Google_Protobuf_BytesValue: SwiftProtobuf.Message, SwiftProtobuf._Mess
     }
   }
 
-  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+  public func traverse<V: SwiftProtobufCore.Visitor>(visitor: inout V) throws {
     if !self.value.isEmpty {
       try visitor.visitSingularBytesField(value: self.value, fieldNumber: 1)
     }

Sources/SwiftProtobufFoundationCompat/SwiftProtobufContiguousBytes.swift

@@ -0,0 +1,14 @@
+// Sources/SwiftProtobuf/SwiftProtobufContiguousBytes.swift
+//
+// Copyright (c) 2022 Apple Inc. and the project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See LICENSE.txt for license information:
+// https://github.com/apple/swift-protobuf/blob/main/LICENSE.txt
+//
+// -----------------------------------------------------------------------------
+
+/// Conformance to this protocol gives users a way to provide their own "bag of bytes" types
+/// to be used for serialization and deserialization of protobufs.
+public protocol SwiftProtobufContiguousBytes {
+}

Sources/SwiftProtobufPluginLibrary/ProtoFileToModuleMappings.swift

@@ -14,7 +14,7 @@
 
 import Foundation
 
-private let defaultSwiftProtobufModuleName = "SwiftProtobuf"
+private let defaultSwiftProtobufModuleName = "SwiftProtobufCore"
 
 /// Handles the mapping of proto files to the modules they will be compiled into.
 public struct ProtoFileToModuleMappings {