Browse Source

Drop Swift 5.9 (#1775)

### Motivation:

Swift 5.9 is no longer supported, we should bump the tools version

### Modifications:

* Bump the Swift tools version to Swift 5.10
* Remove unsupported versions from CI in build.yml

### Result:

Code reflects the expected support window.
Rick Newton-Rogers 10 months ago
parent
commit
e41d3f0c93
97 changed files with 2643 additions and 3862 deletions
  1. 0 4
      .github/workflows/build.yml
  2. 0 2
      CompileTests/InternalImportsByDefault/Sources/InternalImportsByDefault/main.swift
  3. 1 0
      FuzzTesting/Package.swift
  4. 0 4
      FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift
  5. 1 1
      Package.swift
  6. 0 4
      PluginExamples/Sources/ExampleTests/AccessLevelOnImportTests.swift
  7. 94 94
      Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto
  8. 16 16
      Protos/SwiftProtobufTests/generated_swift_names_enums.proto
  9. 94 94
      Protos/SwiftProtobufTests/generated_swift_names_fields.proto
  10. 16 16
      Protos/SwiftProtobufTests/generated_swift_names_messages.proto
  11. 1 1
      README.md
  12. 0 8
      Reference/Conformance/conformance/test_protos/test_messages_edition2023.pb.swift
  13. 0 16
      Reference/Conformance/editions/test_messages_proto2_editions.pb.swift
  14. 0 8
      Reference/Conformance/editions/test_messages_proto3_editions.pb.swift
  15. 0 16
      Reference/Conformance/google/protobuf/test_messages_proto2.pb.swift
  16. 0 8
      Reference/Conformance/google/protobuf/test_messages_proto3.pb.swift
  17. 0 24
      Reference/SwiftProtobuf/google/protobuf/descriptor.pb.swift
  18. 0 4
      Reference/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_delimited.pb.swift
  19. 0 12
      Reference/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test.pb.swift
  20. 0 4
      Reference/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift
  21. 0 4
      Reference/SwiftProtobufTests/fuzz_testing.pb.swift
  22. 364 364
      Reference/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
  23. 325 325
      Reference/SwiftProtobufTests/generated_swift_names_enums.pb.swift
  24. 346 350
      Reference/SwiftProtobufTests/generated_swift_names_fields.pb.swift
  25. 173 365
      Reference/SwiftProtobufTests/generated_swift_names_messages.pb.swift
  26. 0 4
      Reference/SwiftProtobufTests/map_unittest.pb.swift
  27. 0 8
      Reference/SwiftProtobufTests/test_messages_proto3.pb.swift
  28. 0 20
      Reference/SwiftProtobufTests/unittest.pb.swift
  29. 0 8
      Reference/SwiftProtobufTests/unittest_proto3.pb.swift
  30. 0 4
      Reference/SwiftProtobufTests/unittest_proto3_optional.pb.swift
  31. 0 4
      Reference/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift
  32. 0 12
      Reference/SwiftProtobufTests/unittest_swift_cycle.pb.swift
  33. 0 8
      Reference/SwiftProtobufTests/unittest_swift_deprecated.pb.swift
  34. 0 4
      Reference/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift
  35. 0 4
      Reference/SwiftProtobufTests/unittest_swift_extension.pb.swift
  36. 0 16
      Reference/SwiftProtobufTests/unittest_swift_naming.pb.swift
  37. 0 8
      Reference/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift
  38. 0 8
      Reference/SwiftProtobufTests/unittest_swift_runtime_proto3.pb.swift
  39. 0 12
      Reference/SwiftProtobufTests/unittest_well_known_types.pb.swift
  40. 0 8
      Reference/upstream/conformance/test_protos/test_messages_edition2023.pb.swift
  41. 0 16
      Reference/upstream/editions/golden/test_messages_proto2_editions.pb.swift
  42. 0 8
      Reference/upstream/editions/golden/test_messages_proto3_editions.pb.swift
  43. 0 24
      Reference/upstream/google/protobuf/descriptor.pb.swift
  44. 0 64
      Reference/upstream/google/protobuf/edition_unittest.pb.swift
  45. 0 8
      Reference/upstream/google/protobuf/map_lite_unittest.pb.swift
  46. 0 8
      Reference/upstream/google/protobuf/map_unittest.pb.swift
  47. 0 16
      Reference/upstream/google/protobuf/sample_messages_edition.pb.swift
  48. 0 16
      Reference/upstream/google/protobuf/test_messages_proto2.pb.swift
  49. 0 8
      Reference/upstream/google/protobuf/test_messages_proto3.pb.swift
  50. 0 80
      Reference/upstream/google/protobuf/unittest.pb.swift
  51. 0 4
      Reference/upstream/google/protobuf/unittest_custom_options.pb.swift
  52. 0 4
      Reference/upstream/google/protobuf/unittest_delimited.pb.swift
  53. 0 4
      Reference/upstream/google/protobuf/unittest_enormous_descriptor.pb.swift
  54. 0 4
      Reference/upstream/google/protobuf/unittest_features.pb.swift
  55. 0 4
      Reference/upstream/google/protobuf/unittest_legacy_features.pb.swift
  56. 0 16
      Reference/upstream/google/protobuf/unittest_lite.pb.swift
  57. 0 8
      Reference/upstream/google/protobuf/unittest_mset.pb.swift
  58. 0 4
      Reference/upstream/google/protobuf/unittest_no_field_presence.pb.swift
  59. 0 12
      Reference/upstream/google/protobuf/unittest_proto3.pb.swift
  60. 0 8
      Reference/upstream/google/protobuf/unittest_proto3_arena.pb.swift
  61. 0 8
      Reference/upstream/google/protobuf/unittest_proto3_arena_lite.pb.swift
  62. 0 8
      Reference/upstream/google/protobuf/unittest_proto3_lite.pb.swift
  63. 0 4
      Reference/upstream/google/protobuf/unittest_proto3_optional.pb.swift
  64. 0 12
      Reference/upstream/google/protobuf/unittest_well_known_types.pb.swift
  65. 0 8
      Sources/Conformance/test_messages_edition2023.pb.swift
  66. 0 16
      Sources/Conformance/test_messages_proto2.pb.swift
  67. 0 16
      Sources/Conformance/test_messages_proto2_editions.pb.swift
  68. 0 8
      Sources/Conformance/test_messages_proto3.pb.swift
  69. 0 8
      Sources/Conformance/test_messages_proto3_editions.pb.swift
  70. 0 4
      Sources/SwiftProtobuf/AnyMessageStorage.swift
  71. 1 3
      Sources/SwiftProtobuf/UnknownStorage.swift
  72. 0 24
      Sources/SwiftProtobuf/descriptor.pb.swift
  73. 1 1
      Sources/SwiftProtobufPluginLibrary/Google_Protobuf_Edition+Extensions.swift
  74. 0 4
      Sources/protoc-gen-swift/MessageStorageClassGenerator.swift
  75. 0 4
      Tests/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_delimited.pb.swift
  76. 0 12
      Tests/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test.pb.swift
  77. 0 4
      Tests/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift
  78. 2 2
      Tests/SwiftProtobufTests/Test_Any.swift
  79. 0 4
      Tests/SwiftProtobufTests/fuzz_testing.pb.swift
  80. 364 364
      Tests/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift
  81. 325 325
      Tests/SwiftProtobufTests/generated_swift_names_enums.pb.swift
  82. 346 350
      Tests/SwiftProtobufTests/generated_swift_names_fields.pb.swift
  83. 173 365
      Tests/SwiftProtobufTests/generated_swift_names_messages.pb.swift
  84. 0 4
      Tests/SwiftProtobufTests/map_unittest.pb.swift
  85. 0 8
      Tests/SwiftProtobufTests/test_messages_proto3.pb.swift
  86. 0 20
      Tests/SwiftProtobufTests/unittest.pb.swift
  87. 0 8
      Tests/SwiftProtobufTests/unittest_proto3.pb.swift
  88. 0 4
      Tests/SwiftProtobufTests/unittest_proto3_optional.pb.swift
  89. 0 4
      Tests/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift
  90. 0 12
      Tests/SwiftProtobufTests/unittest_swift_cycle.pb.swift
  91. 0 8
      Tests/SwiftProtobufTests/unittest_swift_deprecated.pb.swift
  92. 0 4
      Tests/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift
  93. 0 4
      Tests/SwiftProtobufTests/unittest_swift_extension.pb.swift
  94. 0 16
      Tests/SwiftProtobufTests/unittest_swift_naming.pb.swift
  95. 0 8
      Tests/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift
  96. 0 8
      Tests/SwiftProtobufTests/unittest_swift_runtime_proto3.pb.swift
  97. 0 12
      Tests/SwiftProtobufTests/unittest_well_known_types.pb.swift

+ 0 - 4
.github/workflows/build.yml

@@ -32,10 +32,6 @@ jobs:
         - version: 5.10.1-noble
           # No "hook", see https://github.com/apple/swift-protobuf/issues/1560 for the
           # current issue with using -warnings-as-errors on linux.
-        - version: 5.9.2-focal
-          hook: "SWIFT_BUILD_TEST_HOOK=\"-Xswiftc -warnings-as-errors\""
-        - version: 5.8.1-focal
-          hook: "SWIFT_BUILD_TEST_HOOK=\"-Xswiftc -warnings-as-errors\""
         # protobuf_git can reference a commit, tag, or branch
         # commit: "commits/6935eae45c99926a000ecbef0be20dfd3d159e71"
         # tag: "ref/tags/v3.11.4"

+ 0 - 2
CompileTests/InternalImportsByDefault/Sources/InternalImportsByDefault/main.swift

@@ -8,7 +8,6 @@
 
 // This test only makes sense for Swift 5.9+ because 5.8 doesn't support access
 // level on imports.
-#if compiler(>=5.9)
 private import Foundation
 
 struct InternalImportsByDefault {
@@ -23,4 +22,3 @@ struct InternalImportsByDefault {
 
 @inline(never)
 func blackhole<T>(_: T) {}
-#endif

+ 1 - 0
FuzzTesting/Package.swift

@@ -1,5 +1,6 @@
 // swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
+// **NOTE**: 5.3 due to https://github.com/swiftlang/swift/issues/75800
 
 import PackageDescription
 

+ 0 - 4
FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift

@@ -3209,15 +3209,11 @@ extension SwiftProtoTesting_Fuzz_Message: SwiftProtobuf.Message, SwiftProtobuf._
     var _singularMessageSet: SwiftProtoTesting_Fuzz_AMessageSetMessage? = nil
     var _repeatedMessageSet: [SwiftProtoTesting_Fuzz_AMessageSetMessage] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 1 - 1
Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.10
 
 // Package.swift
 //

+ 0 - 4
PluginExamples/Sources/ExampleTests/AccessLevelOnImportTests.swift

@@ -1,5 +1,3 @@
-#if compiler(>=5.9)
-
 import AccessLevelOnImport
 import XCTest
 
@@ -9,5 +7,3 @@ final class AccessLevelOnImportTests: XCTestCase {
         XCTAssertEqual(access.dependency.name, "Dependency")
     }
 }
-
-#endif

+ 94 - 94
Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto

@@ -13,7 +13,7 @@ enum GeneratedSwiftReservedEnum {
   alwaysPrintEnumsAsInts = 6;
   alwaysPrintInt64sAsNumbers = 7;
   annotation = 8;
-  Any = 9;
+  any = 9;
   AnyExtensionField = 10;
   AnyMessageExtension = 11;
   AnyMessageStorage = 12;
@@ -194,7 +194,7 @@ enum GeneratedSwiftReservedEnum {
   customCodable = 187;
   CustomDebugStringConvertible = 188;
   CustomStringConvertible = 189;
-  D = 190;
+  d = 190;
   Data = 191;
   dataResult = 192;
   date = 193;
@@ -210,7 +210,7 @@ enum GeneratedSwiftReservedEnum {
   decodeJSON = 203;
   decodeMapField = 204;
   decodeMessage = 205;
-  Decoder = 206;
+  decoder = 206;
   decodeRepeated = 207;
   decodeRepeatedBoolField = 208;
   decodeRepeatedBytesField = 209;
@@ -272,7 +272,7 @@ enum GeneratedSwiftReservedEnum {
   discardUnknownFields = 265;
   Double = 266;
   doubleValue = 267;
-  Duration = 268;
+  duration = 268;
   E = 269;
   edition = 270;
   EditionDefault = 271;
@@ -385,60 +385,60 @@ enum GeneratedSwiftReservedEnum {
   GeneratedCodeInfo = 378;
   get = 379;
   getExtensionValue = 380;
-  Google_Protobuf_Any = 381;
-  Google_Protobuf_Api = 382;
-  Google_Protobuf_BoolValue = 383;
-  Google_Protobuf_BytesValue = 384;
-  Google_Protobuf_DescriptorProto = 385;
-  Google_Protobuf_DoubleValue = 386;
-  Google_Protobuf_Duration = 387;
-  Google_Protobuf_Edition = 388;
-  Google_Protobuf_Empty = 389;
-  Google_Protobuf_Enum = 390;
-  Google_Protobuf_EnumDescriptorProto = 391;
-  Google_Protobuf_EnumOptions = 392;
-  Google_Protobuf_EnumValue = 393;
-  Google_Protobuf_EnumValueDescriptorProto = 394;
-  Google_Protobuf_EnumValueOptions = 395;
-  Google_Protobuf_ExtensionRangeOptions = 396;
-  Google_Protobuf_FeatureSet = 397;
-  Google_Protobuf_FeatureSetDefaults = 398;
-  Google_Protobuf_Field = 399;
-  Google_Protobuf_FieldDescriptorProto = 400;
-  Google_Protobuf_FieldMask = 401;
-  Google_Protobuf_FieldOptions = 402;
-  Google_Protobuf_FileDescriptorProto = 403;
-  Google_Protobuf_FileDescriptorSet = 404;
-  Google_Protobuf_FileOptions = 405;
-  Google_Protobuf_FloatValue = 406;
-  Google_Protobuf_GeneratedCodeInfo = 407;
-  Google_Protobuf_Int32Value = 408;
-  Google_Protobuf_Int64Value = 409;
-  Google_Protobuf_ListValue = 410;
-  Google_Protobuf_MessageOptions = 411;
-  Google_Protobuf_Method = 412;
-  Google_Protobuf_MethodDescriptorProto = 413;
-  Google_Protobuf_MethodOptions = 414;
-  Google_Protobuf_Mixin = 415;
-  Google_Protobuf_NullValue = 416;
-  Google_Protobuf_OneofDescriptorProto = 417;
-  Google_Protobuf_OneofOptions = 418;
-  Google_Protobuf_Option = 419;
-  Google_Protobuf_ServiceDescriptorProto = 420;
-  Google_Protobuf_ServiceOptions = 421;
-  Google_Protobuf_SourceCodeInfo = 422;
-  Google_Protobuf_SourceContext = 423;
-  Google_Protobuf_StringValue = 424;
-  Google_Protobuf_Struct = 425;
-  Google_Protobuf_SymbolVisibility = 426;
-  Google_Protobuf_Syntax = 427;
-  Google_Protobuf_Timestamp = 428;
-  Google_Protobuf_Type = 429;
-  Google_Protobuf_UInt32Value = 430;
-  Google_Protobuf_UInt64Value = 431;
-  Google_Protobuf_UninterpretedOption = 432;
-  Google_Protobuf_Value = 433;
-  googleapis = 434;
+  googleapis = 381;
+  Google_Protobuf_Any = 382;
+  Google_Protobuf_Api = 383;
+  Google_Protobuf_BoolValue = 384;
+  Google_Protobuf_BytesValue = 385;
+  Google_Protobuf_DescriptorProto = 386;
+  Google_Protobuf_DoubleValue = 387;
+  Google_Protobuf_Duration = 388;
+  Google_Protobuf_Edition = 389;
+  Google_Protobuf_Empty = 390;
+  Google_Protobuf_Enum = 391;
+  Google_Protobuf_EnumDescriptorProto = 392;
+  Google_Protobuf_EnumOptions = 393;
+  Google_Protobuf_EnumValue = 394;
+  Google_Protobuf_EnumValueDescriptorProto = 395;
+  Google_Protobuf_EnumValueOptions = 396;
+  Google_Protobuf_ExtensionRangeOptions = 397;
+  Google_Protobuf_FeatureSet = 398;
+  Google_Protobuf_FeatureSetDefaults = 399;
+  Google_Protobuf_Field = 400;
+  Google_Protobuf_FieldDescriptorProto = 401;
+  Google_Protobuf_FieldMask = 402;
+  Google_Protobuf_FieldOptions = 403;
+  Google_Protobuf_FileDescriptorProto = 404;
+  Google_Protobuf_FileDescriptorSet = 405;
+  Google_Protobuf_FileOptions = 406;
+  Google_Protobuf_FloatValue = 407;
+  Google_Protobuf_GeneratedCodeInfo = 408;
+  Google_Protobuf_Int32Value = 409;
+  Google_Protobuf_Int64Value = 410;
+  Google_Protobuf_ListValue = 411;
+  Google_Protobuf_MessageOptions = 412;
+  Google_Protobuf_Method = 413;
+  Google_Protobuf_MethodDescriptorProto = 414;
+  Google_Protobuf_MethodOptions = 415;
+  Google_Protobuf_Mixin = 416;
+  Google_Protobuf_NullValue = 417;
+  Google_Protobuf_OneofDescriptorProto = 418;
+  Google_Protobuf_OneofOptions = 419;
+  Google_Protobuf_Option = 420;
+  Google_Protobuf_ServiceDescriptorProto = 421;
+  Google_Protobuf_ServiceOptions = 422;
+  Google_Protobuf_SourceCodeInfo = 423;
+  Google_Protobuf_SourceContext = 424;
+  Google_Protobuf_StringValue = 425;
+  Google_Protobuf_Struct = 426;
+  Google_Protobuf_SymbolVisibility = 427;
+  Google_Protobuf_Syntax = 428;
+  Google_Protobuf_Timestamp = 429;
+  Google_Protobuf_Type = 430;
+  Google_Protobuf_UInt32Value = 431;
+  Google_Protobuf_UInt64Value = 432;
+  Google_Protobuf_UninterpretedOption = 433;
+  Google_Protobuf_Value = 434;
   goPackage = 435;
   gotData = 436;
   group = 437;
@@ -696,12 +696,12 @@ enum GeneratedSwiftReservedEnum {
   numberValue = 689;
   objcClassPrefix = 690;
   of = 691;
-  OneOf_Kind = 692;
-  oneofDecl = 693;
-  OneofDescriptorProto = 694;
-  oneofIndex = 695;
-  OneofOptions = 696;
-  oneofs = 697;
+  oneofDecl = 692;
+  OneofDescriptorProto = 693;
+  oneofIndex = 694;
+  OneofOptions = 695;
+  oneofs = 696;
+  OneOf_Kind = 697;
   optimizeFor = 698;
   OptimizeMode = 699;
   Option = 700;
@@ -747,33 +747,33 @@ enum GeneratedSwiftReservedEnum {
   proto2 = 740;
   proto3DefaultValue = 741;
   proto3Optional = 742;
-  protobuf_extensionFieldValues = 743;
-  protobuf_fieldNumber = 744;
-  protobuf_generated_isEqualTo = 745;
-  protobuf_nameMap = 746;
-  protobuf_newField = 747;
-  protobuf_package = 748;
-  ProtobufAPIVersion_2 = 749;
-  ProtobufAPIVersionCheck = 750;
-  ProtobufBool = 751;
-  ProtobufBytes = 752;
-  ProtobufDouble = 753;
-  ProtobufEnumMap = 754;
-  protobufExtension = 755;
-  ProtobufFixed32 = 756;
-  ProtobufFixed64 = 757;
-  ProtobufFloat = 758;
-  ProtobufInt32 = 759;
-  ProtobufInt64 = 760;
-  ProtobufMap = 761;
-  ProtobufMessageMap = 762;
-  ProtobufSFixed32 = 763;
-  ProtobufSFixed64 = 764;
-  ProtobufSInt32 = 765;
-  ProtobufSInt64 = 766;
-  ProtobufString = 767;
-  ProtobufUInt32 = 768;
-  ProtobufUInt64 = 769;
+  ProtobufAPIVersionCheck = 743;
+  ProtobufAPIVersion_2 = 744;
+  ProtobufBool = 745;
+  ProtobufBytes = 746;
+  ProtobufDouble = 747;
+  ProtobufEnumMap = 748;
+  protobufExtension = 749;
+  ProtobufFixed32 = 750;
+  ProtobufFixed64 = 751;
+  ProtobufFloat = 752;
+  ProtobufInt32 = 753;
+  ProtobufInt64 = 754;
+  ProtobufMap = 755;
+  ProtobufMessageMap = 756;
+  ProtobufSFixed32 = 757;
+  ProtobufSFixed64 = 758;
+  ProtobufSInt32 = 759;
+  ProtobufSInt64 = 760;
+  ProtobufString = 761;
+  ProtobufUInt32 = 762;
+  ProtobufUInt64 = 763;
+  protobuf_extensionFieldValues = 764;
+  protobuf_fieldNumber = 765;
+  protobuf_generated_isEqualTo = 766;
+  protobuf_nameMap = 767;
+  protobuf_newField = 768;
+  protobuf_package = 769;
   protocol = 770;
   protoFieldName = 771;
   protoMessageName = 772;
@@ -954,7 +954,7 @@ enum GeneratedSwiftReservedEnum {
   utf8ToDouble = 947;
   utf8Validation = 948;
   UTF8View = 949;
-  V = 950;
+  v = 950;
   value = 951;
   valueField = 952;
   values = 953;
@@ -962,14 +962,14 @@ enum GeneratedSwiftReservedEnum {
   var = 955;
   verification = 956;
   VerificationState = 957;
-  version = 958;
+  Version = 958;
   versionString = 959;
   visibility = 960;
   VisibilityFeature = 961;
   visitExtensionFields = 962;
   visitExtensionFieldsAsMessageSet = 963;
   visitMapField = 964;
-  Visitor = 965;
+  visitor = 965;
   visitPacked = 966;
   visitPackedBoolField = 967;
   visitPackedDoubleField = 968;

+ 16 - 16
Protos/SwiftProtobufTests/generated_swift_names_enums.proto

@@ -12,7 +12,7 @@ message GeneratedSwiftReservedEnums {
   enum alwaysPrintEnumsAsInts { NONE_alwaysPrintEnumsAsInts = 0; }
   enum alwaysPrintInt64sAsNumbers { NONE_alwaysPrintInt64sAsNumbers = 0; }
   enum annotation { NONE_annotation = 0; }
-  enum Any { NONE_Any = 0; }
+  enum any { NONE_any = 0; }
   enum AnyExtensionField { NONE_AnyExtensionField = 0; }
   enum AnyMessageExtension { NONE_AnyMessageExtension = 0; }
   enum AnyMessageStorage { NONE_AnyMessageStorage = 0; }
@@ -193,7 +193,7 @@ message GeneratedSwiftReservedEnums {
   enum customCodable { NONE_customCodable = 0; }
   enum CustomDebugStringConvertible { NONE_CustomDebugStringConvertible = 0; }
   enum CustomStringConvertible { NONE_CustomStringConvertible = 0; }
-  enum D { NONE_D = 0; }
+  enum d { NONE_d = 0; }
   enum Data { NONE_Data = 0; }
   enum dataResult { NONE_dataResult = 0; }
   enum date { NONE_date = 0; }
@@ -209,7 +209,7 @@ message GeneratedSwiftReservedEnums {
   enum decodeJSON { NONE_decodeJSON = 0; }
   enum decodeMapField { NONE_decodeMapField = 0; }
   enum decodeMessage { NONE_decodeMessage = 0; }
-  enum Decoder { NONE_Decoder = 0; }
+  enum decoder { NONE_decoder = 0; }
   enum decodeRepeated { NONE_decodeRepeated = 0; }
   enum decodeRepeatedBoolField { NONE_decodeRepeatedBoolField = 0; }
   enum decodeRepeatedBytesField { NONE_decodeRepeatedBytesField = 0; }
@@ -271,7 +271,7 @@ message GeneratedSwiftReservedEnums {
   enum discardUnknownFields { NONE_discardUnknownFields = 0; }
   enum Double { NONE_Double = 0; }
   enum doubleValue { NONE_doubleValue = 0; }
-  enum Duration { NONE_Duration = 0; }
+  enum duration { NONE_duration = 0; }
   enum E { NONE_E = 0; }
   enum edition { NONE_edition = 0; }
   enum EditionDefault { NONE_EditionDefault = 0; }
@@ -384,6 +384,7 @@ message GeneratedSwiftReservedEnums {
   enum GeneratedCodeInfo { NONE_GeneratedCodeInfo = 0; }
   enum get { NONE_get = 0; }
   enum getExtensionValue { NONE_getExtensionValue = 0; }
+  enum googleapis { NONE_googleapis = 0; }
   enum Google_Protobuf_Any { NONE_Google_Protobuf_Any = 0; }
   enum Google_Protobuf_Api { NONE_Google_Protobuf_Api = 0; }
   enum Google_Protobuf_BoolValue { NONE_Google_Protobuf_BoolValue = 0; }
@@ -437,7 +438,6 @@ message GeneratedSwiftReservedEnums {
   enum Google_Protobuf_UInt64Value { NONE_Google_Protobuf_UInt64Value = 0; }
   enum Google_Protobuf_UninterpretedOption { NONE_Google_Protobuf_UninterpretedOption = 0; }
   enum Google_Protobuf_Value { NONE_Google_Protobuf_Value = 0; }
-  enum googleapis { NONE_googleapis = 0; }
   enum goPackage { NONE_goPackage = 0; }
   enum gotData { NONE_gotData = 0; }
   enum group { NONE_group = 0; }
@@ -695,12 +695,12 @@ message GeneratedSwiftReservedEnums {
   enum numberValue { NONE_numberValue = 0; }
   enum objcClassPrefix { NONE_objcClassPrefix = 0; }
   enum of { NONE_of = 0; }
-  enum OneOf_Kind { NONE_OneOf_Kind = 0; }
   enum oneofDecl { NONE_oneofDecl = 0; }
   enum OneofDescriptorProto { NONE_OneofDescriptorProto = 0; }
   enum oneofIndex { NONE_oneofIndex = 0; }
   enum OneofOptions { NONE_OneofOptions = 0; }
   enum oneofs { NONE_oneofs = 0; }
+  enum OneOf_Kind { NONE_OneOf_Kind = 0; }
   enum optimizeFor { NONE_optimizeFor = 0; }
   enum OptimizeMode { NONE_OptimizeMode = 0; }
   enum Option { NONE_Option = 0; }
@@ -746,14 +746,8 @@ message GeneratedSwiftReservedEnums {
   enum proto2 { NONE_proto2 = 0; }
   enum proto3DefaultValue { NONE_proto3DefaultValue = 0; }
   enum proto3Optional { NONE_proto3Optional = 0; }
-  enum protobuf_extensionFieldValues { NONE_protobuf_extensionFieldValues = 0; }
-  enum protobuf_fieldNumber { NONE_protobuf_fieldNumber = 0; }
-  enum protobuf_generated_isEqualTo { NONE_protobuf_generated_isEqualTo = 0; }
-  enum protobuf_nameMap { NONE_protobuf_nameMap = 0; }
-  enum protobuf_newField { NONE_protobuf_newField = 0; }
-  enum protobuf_package { NONE_protobuf_package = 0; }
-  enum ProtobufAPIVersion_2 { NONE_ProtobufAPIVersion_2 = 0; }
   enum ProtobufAPIVersionCheck { NONE_ProtobufAPIVersionCheck = 0; }
+  enum ProtobufAPIVersion_2 { NONE_ProtobufAPIVersion_2 = 0; }
   enum ProtobufBool { NONE_ProtobufBool = 0; }
   enum ProtobufBytes { NONE_ProtobufBytes = 0; }
   enum ProtobufDouble { NONE_ProtobufDouble = 0; }
@@ -773,6 +767,12 @@ message GeneratedSwiftReservedEnums {
   enum ProtobufString { NONE_ProtobufString = 0; }
   enum ProtobufUInt32 { NONE_ProtobufUInt32 = 0; }
   enum ProtobufUInt64 { NONE_ProtobufUInt64 = 0; }
+  enum protobuf_extensionFieldValues { NONE_protobuf_extensionFieldValues = 0; }
+  enum protobuf_fieldNumber { NONE_protobuf_fieldNumber = 0; }
+  enum protobuf_generated_isEqualTo { NONE_protobuf_generated_isEqualTo = 0; }
+  enum protobuf_nameMap { NONE_protobuf_nameMap = 0; }
+  enum protobuf_newField { NONE_protobuf_newField = 0; }
+  enum protobuf_package { NONE_protobuf_package = 0; }
   enum protocol { NONE_protocol = 0; }
   enum protoFieldName { NONE_protoFieldName = 0; }
   enum protoMessageName { NONE_protoMessageName = 0; }
@@ -953,7 +953,7 @@ message GeneratedSwiftReservedEnums {
   enum utf8ToDouble { NONE_utf8ToDouble = 0; }
   enum utf8Validation { NONE_utf8Validation = 0; }
   enum UTF8View { NONE_UTF8View = 0; }
-  enum V { NONE_V = 0; }
+  enum v { NONE_v = 0; }
   enum value { NONE_value = 0; }
   enum valueField { NONE_valueField = 0; }
   enum values { NONE_values = 0; }
@@ -961,14 +961,14 @@ message GeneratedSwiftReservedEnums {
   enum var { NONE_var = 0; }
   enum verification { NONE_verification = 0; }
   enum VerificationState { NONE_VerificationState = 0; }
-  enum version { NONE_version = 0; }
+  enum Version { NONE_Version = 0; }
   enum versionString { NONE_versionString = 0; }
   enum visibility { NONE_visibility = 0; }
   enum VisibilityFeature { NONE_VisibilityFeature = 0; }
   enum visitExtensionFields { NONE_visitExtensionFields = 0; }
   enum visitExtensionFieldsAsMessageSet { NONE_visitExtensionFieldsAsMessageSet = 0; }
   enum visitMapField { NONE_visitMapField = 0; }
-  enum Visitor { NONE_Visitor = 0; }
+  enum visitor { NONE_visitor = 0; }
   enum visitPacked { NONE_visitPacked = 0; }
   enum visitPackedBoolField { NONE_visitPackedBoolField = 0; }
   enum visitPackedDoubleField { NONE_visitPackedDoubleField = 0; }

+ 94 - 94
Protos/SwiftProtobufTests/generated_swift_names_fields.proto

@@ -12,7 +12,7 @@ message GeneratedSwiftReservedFields {
   int32 alwaysPrintEnumsAsInts = 6;
   int32 alwaysPrintInt64sAsNumbers = 7;
   int32 annotation = 8;
-  int32 Any = 9;
+  int32 any = 9;
   int32 AnyExtensionField = 10;
   int32 AnyMessageExtension = 11;
   int32 AnyMessageStorage = 12;
@@ -193,7 +193,7 @@ message GeneratedSwiftReservedFields {
   int32 customCodable = 187;
   int32 CustomDebugStringConvertible = 188;
   int32 CustomStringConvertible = 189;
-  int32 D = 190;
+  int32 d = 190;
   int32 Data = 191;
   int32 dataResult = 192;
   int32 date = 193;
@@ -209,7 +209,7 @@ message GeneratedSwiftReservedFields {
   int32 decodeJSON = 203;
   int32 decodeMapField = 204;
   int32 decodeMessage = 205;
-  int32 Decoder = 206;
+  int32 decoder = 206;
   int32 decodeRepeated = 207;
   int32 decodeRepeatedBoolField = 208;
   int32 decodeRepeatedBytesField = 209;
@@ -271,7 +271,7 @@ message GeneratedSwiftReservedFields {
   int32 discardUnknownFields = 265;
   int32 Double = 266;
   int32 doubleValue = 267;
-  int32 Duration = 268;
+  int32 duration = 268;
   int32 E = 269;
   int32 edition = 270;
   int32 EditionDefault = 271;
@@ -384,60 +384,60 @@ message GeneratedSwiftReservedFields {
   int32 GeneratedCodeInfo = 378;
   int32 get = 379;
   int32 getExtensionValue = 380;
-  int32 Google_Protobuf_Any = 381;
-  int32 Google_Protobuf_Api = 382;
-  int32 Google_Protobuf_BoolValue = 383;
-  int32 Google_Protobuf_BytesValue = 384;
-  int32 Google_Protobuf_DescriptorProto = 385;
-  int32 Google_Protobuf_DoubleValue = 386;
-  int32 Google_Protobuf_Duration = 387;
-  int32 Google_Protobuf_Edition = 388;
-  int32 Google_Protobuf_Empty = 389;
-  int32 Google_Protobuf_Enum = 390;
-  int32 Google_Protobuf_EnumDescriptorProto = 391;
-  int32 Google_Protobuf_EnumOptions = 392;
-  int32 Google_Protobuf_EnumValue = 393;
-  int32 Google_Protobuf_EnumValueDescriptorProto = 394;
-  int32 Google_Protobuf_EnumValueOptions = 395;
-  int32 Google_Protobuf_ExtensionRangeOptions = 396;
-  int32 Google_Protobuf_FeatureSet = 397;
-  int32 Google_Protobuf_FeatureSetDefaults = 398;
-  int32 Google_Protobuf_Field = 399;
-  int32 Google_Protobuf_FieldDescriptorProto = 400;
-  int32 Google_Protobuf_FieldMask = 401;
-  int32 Google_Protobuf_FieldOptions = 402;
-  int32 Google_Protobuf_FileDescriptorProto = 403;
-  int32 Google_Protobuf_FileDescriptorSet = 404;
-  int32 Google_Protobuf_FileOptions = 405;
-  int32 Google_Protobuf_FloatValue = 406;
-  int32 Google_Protobuf_GeneratedCodeInfo = 407;
-  int32 Google_Protobuf_Int32Value = 408;
-  int32 Google_Protobuf_Int64Value = 409;
-  int32 Google_Protobuf_ListValue = 410;
-  int32 Google_Protobuf_MessageOptions = 411;
-  int32 Google_Protobuf_Method = 412;
-  int32 Google_Protobuf_MethodDescriptorProto = 413;
-  int32 Google_Protobuf_MethodOptions = 414;
-  int32 Google_Protobuf_Mixin = 415;
-  int32 Google_Protobuf_NullValue = 416;
-  int32 Google_Protobuf_OneofDescriptorProto = 417;
-  int32 Google_Protobuf_OneofOptions = 418;
-  int32 Google_Protobuf_Option = 419;
-  int32 Google_Protobuf_ServiceDescriptorProto = 420;
-  int32 Google_Protobuf_ServiceOptions = 421;
-  int32 Google_Protobuf_SourceCodeInfo = 422;
-  int32 Google_Protobuf_SourceContext = 423;
-  int32 Google_Protobuf_StringValue = 424;
-  int32 Google_Protobuf_Struct = 425;
-  int32 Google_Protobuf_SymbolVisibility = 426;
-  int32 Google_Protobuf_Syntax = 427;
-  int32 Google_Protobuf_Timestamp = 428;
-  int32 Google_Protobuf_Type = 429;
-  int32 Google_Protobuf_UInt32Value = 430;
-  int32 Google_Protobuf_UInt64Value = 431;
-  int32 Google_Protobuf_UninterpretedOption = 432;
-  int32 Google_Protobuf_Value = 433;
-  int32 googleapis = 434;
+  int32 googleapis = 381;
+  int32 Google_Protobuf_Any = 382;
+  int32 Google_Protobuf_Api = 383;
+  int32 Google_Protobuf_BoolValue = 384;
+  int32 Google_Protobuf_BytesValue = 385;
+  int32 Google_Protobuf_DescriptorProto = 386;
+  int32 Google_Protobuf_DoubleValue = 387;
+  int32 Google_Protobuf_Duration = 388;
+  int32 Google_Protobuf_Edition = 389;
+  int32 Google_Protobuf_Empty = 390;
+  int32 Google_Protobuf_Enum = 391;
+  int32 Google_Protobuf_EnumDescriptorProto = 392;
+  int32 Google_Protobuf_EnumOptions = 393;
+  int32 Google_Protobuf_EnumValue = 394;
+  int32 Google_Protobuf_EnumValueDescriptorProto = 395;
+  int32 Google_Protobuf_EnumValueOptions = 396;
+  int32 Google_Protobuf_ExtensionRangeOptions = 397;
+  int32 Google_Protobuf_FeatureSet = 398;
+  int32 Google_Protobuf_FeatureSetDefaults = 399;
+  int32 Google_Protobuf_Field = 400;
+  int32 Google_Protobuf_FieldDescriptorProto = 401;
+  int32 Google_Protobuf_FieldMask = 402;
+  int32 Google_Protobuf_FieldOptions = 403;
+  int32 Google_Protobuf_FileDescriptorProto = 404;
+  int32 Google_Protobuf_FileDescriptorSet = 405;
+  int32 Google_Protobuf_FileOptions = 406;
+  int32 Google_Protobuf_FloatValue = 407;
+  int32 Google_Protobuf_GeneratedCodeInfo = 408;
+  int32 Google_Protobuf_Int32Value = 409;
+  int32 Google_Protobuf_Int64Value = 410;
+  int32 Google_Protobuf_ListValue = 411;
+  int32 Google_Protobuf_MessageOptions = 412;
+  int32 Google_Protobuf_Method = 413;
+  int32 Google_Protobuf_MethodDescriptorProto = 414;
+  int32 Google_Protobuf_MethodOptions = 415;
+  int32 Google_Protobuf_Mixin = 416;
+  int32 Google_Protobuf_NullValue = 417;
+  int32 Google_Protobuf_OneofDescriptorProto = 418;
+  int32 Google_Protobuf_OneofOptions = 419;
+  int32 Google_Protobuf_Option = 420;
+  int32 Google_Protobuf_ServiceDescriptorProto = 421;
+  int32 Google_Protobuf_ServiceOptions = 422;
+  int32 Google_Protobuf_SourceCodeInfo = 423;
+  int32 Google_Protobuf_SourceContext = 424;
+  int32 Google_Protobuf_StringValue = 425;
+  int32 Google_Protobuf_Struct = 426;
+  int32 Google_Protobuf_SymbolVisibility = 427;
+  int32 Google_Protobuf_Syntax = 428;
+  int32 Google_Protobuf_Timestamp = 429;
+  int32 Google_Protobuf_Type = 430;
+  int32 Google_Protobuf_UInt32Value = 431;
+  int32 Google_Protobuf_UInt64Value = 432;
+  int32 Google_Protobuf_UninterpretedOption = 433;
+  int32 Google_Protobuf_Value = 434;
   int32 goPackage = 435;
   int32 gotData = 436;
   int32 group = 437;
@@ -695,12 +695,12 @@ message GeneratedSwiftReservedFields {
   int32 numberValue = 689;
   int32 objcClassPrefix = 690;
   int32 of = 691;
-  int32 OneOf_Kind = 692;
-  int32 oneofDecl = 693;
-  int32 OneofDescriptorProto = 694;
-  int32 oneofIndex = 695;
-  int32 OneofOptions = 696;
-  int32 oneofs = 697;
+  int32 oneofDecl = 692;
+  int32 OneofDescriptorProto = 693;
+  int32 oneofIndex = 694;
+  int32 OneofOptions = 695;
+  int32 oneofs = 696;
+  int32 OneOf_Kind = 697;
   int32 optimizeFor = 698;
   int32 OptimizeMode = 699;
   int32 Option = 700;
@@ -746,33 +746,33 @@ message GeneratedSwiftReservedFields {
   int32 proto2 = 740;
   int32 proto3DefaultValue = 741;
   int32 proto3Optional = 742;
-  int32 protobuf_extensionFieldValues = 743;
-  int32 protobuf_fieldNumber = 744;
-  int32 protobuf_generated_isEqualTo = 745;
-  int32 protobuf_nameMap = 746;
-  int32 protobuf_newField = 747;
-  int32 protobuf_package = 748;
-  int32 ProtobufAPIVersion_2 = 749;
-  int32 ProtobufAPIVersionCheck = 750;
-  int32 ProtobufBool = 751;
-  int32 ProtobufBytes = 752;
-  int32 ProtobufDouble = 753;
-  int32 ProtobufEnumMap = 754;
-  int32 protobufExtension = 755;
-  int32 ProtobufFixed32 = 756;
-  int32 ProtobufFixed64 = 757;
-  int32 ProtobufFloat = 758;
-  int32 ProtobufInt32 = 759;
-  int32 ProtobufInt64 = 760;
-  int32 ProtobufMap = 761;
-  int32 ProtobufMessageMap = 762;
-  int32 ProtobufSFixed32 = 763;
-  int32 ProtobufSFixed64 = 764;
-  int32 ProtobufSInt32 = 765;
-  int32 ProtobufSInt64 = 766;
-  int32 ProtobufString = 767;
-  int32 ProtobufUInt32 = 768;
-  int32 ProtobufUInt64 = 769;
+  int32 ProtobufAPIVersionCheck = 743;
+  int32 ProtobufAPIVersion_2 = 744;
+  int32 ProtobufBool = 745;
+  int32 ProtobufBytes = 746;
+  int32 ProtobufDouble = 747;
+  int32 ProtobufEnumMap = 748;
+  int32 protobufExtension = 749;
+  int32 ProtobufFixed32 = 750;
+  int32 ProtobufFixed64 = 751;
+  int32 ProtobufFloat = 752;
+  int32 ProtobufInt32 = 753;
+  int32 ProtobufInt64 = 754;
+  int32 ProtobufMap = 755;
+  int32 ProtobufMessageMap = 756;
+  int32 ProtobufSFixed32 = 757;
+  int32 ProtobufSFixed64 = 758;
+  int32 ProtobufSInt32 = 759;
+  int32 ProtobufSInt64 = 760;
+  int32 ProtobufString = 761;
+  int32 ProtobufUInt32 = 762;
+  int32 ProtobufUInt64 = 763;
+  int32 protobuf_extensionFieldValues = 764;
+  int32 protobuf_fieldNumber = 765;
+  int32 protobuf_generated_isEqualTo = 766;
+  int32 protobuf_nameMap = 767;
+  int32 protobuf_newField = 768;
+  int32 protobuf_package = 769;
   int32 protocol = 770;
   int32 protoFieldName = 771;
   int32 protoMessageName = 772;
@@ -953,7 +953,7 @@ message GeneratedSwiftReservedFields {
   int32 utf8ToDouble = 947;
   int32 utf8Validation = 948;
   int32 UTF8View = 949;
-  int32 V = 950;
+  int32 v = 950;
   int32 value = 951;
   int32 valueField = 952;
   int32 values = 953;
@@ -961,14 +961,14 @@ message GeneratedSwiftReservedFields {
   int32 var = 955;
   int32 verification = 956;
   int32 VerificationState = 957;
-  int32 version = 958;
+  int32 Version = 958;
   int32 versionString = 959;
   int32 visibility = 960;
   int32 VisibilityFeature = 961;
   int32 visitExtensionFields = 962;
   int32 visitExtensionFieldsAsMessageSet = 963;
   int32 visitMapField = 964;
-  int32 Visitor = 965;
+  int32 visitor = 965;
   int32 visitPacked = 966;
   int32 visitPackedBoolField = 967;
   int32 visitPackedDoubleField = 968;

+ 16 - 16
Protos/SwiftProtobufTests/generated_swift_names_messages.proto

@@ -12,7 +12,7 @@ message GeneratedSwiftReservedMessages {
   message alwaysPrintEnumsAsInts { int32 alwaysPrintEnumsAsInts = 1; }
   message alwaysPrintInt64sAsNumbers { int32 alwaysPrintInt64sAsNumbers = 1; }
   message annotation { int32 annotation = 1; }
-  message Any { int32 Any = 1; }
+  message any { int32 any = 1; }
   message AnyExtensionField { int32 AnyExtensionField = 1; }
   message AnyMessageExtension { int32 AnyMessageExtension = 1; }
   message AnyMessageStorage { int32 AnyMessageStorage = 1; }
@@ -193,7 +193,7 @@ message GeneratedSwiftReservedMessages {
   message customCodable { int32 customCodable = 1; }
   message CustomDebugStringConvertible { int32 CustomDebugStringConvertible = 1; }
   message CustomStringConvertible { int32 CustomStringConvertible = 1; }
-  message D { int32 D = 1; }
+  message d { int32 d = 1; }
   message Data { int32 Data = 1; }
   message dataResult { int32 dataResult = 1; }
   message date { int32 date = 1; }
@@ -209,7 +209,7 @@ message GeneratedSwiftReservedMessages {
   message decodeJSON { int32 decodeJSON = 1; }
   message decodeMapField { int32 decodeMapField = 1; }
   message decodeMessage { int32 decodeMessage = 1; }
-  message Decoder { int32 Decoder = 1; }
+  message decoder { int32 decoder = 1; }
   message decodeRepeated { int32 decodeRepeated = 1; }
   message decodeRepeatedBoolField { int32 decodeRepeatedBoolField = 1; }
   message decodeRepeatedBytesField { int32 decodeRepeatedBytesField = 1; }
@@ -271,7 +271,7 @@ message GeneratedSwiftReservedMessages {
   message discardUnknownFields { int32 discardUnknownFields = 1; }
   message Double { int32 Double = 1; }
   message doubleValue { int32 doubleValue = 1; }
-  message Duration { int32 Duration = 1; }
+  message duration { int32 duration = 1; }
   message E { int32 E = 1; }
   message edition { int32 edition = 1; }
   message EditionDefault { int32 EditionDefault = 1; }
@@ -384,6 +384,7 @@ message GeneratedSwiftReservedMessages {
   message GeneratedCodeInfo { int32 GeneratedCodeInfo = 1; }
   message get { int32 get = 1; }
   message getExtensionValue { int32 getExtensionValue = 1; }
+  message googleapis { int32 googleapis = 1; }
   message Google_Protobuf_Any { int32 Google_Protobuf_Any = 1; }
   message Google_Protobuf_Api { int32 Google_Protobuf_Api = 1; }
   message Google_Protobuf_BoolValue { int32 Google_Protobuf_BoolValue = 1; }
@@ -437,7 +438,6 @@ message GeneratedSwiftReservedMessages {
   message Google_Protobuf_UInt64Value { int32 Google_Protobuf_UInt64Value = 1; }
   message Google_Protobuf_UninterpretedOption { int32 Google_Protobuf_UninterpretedOption = 1; }
   message Google_Protobuf_Value { int32 Google_Protobuf_Value = 1; }
-  message googleapis { int32 googleapis = 1; }
   message goPackage { int32 goPackage = 1; }
   message gotData { int32 gotData = 1; }
   message group { int32 group = 1; }
@@ -695,12 +695,12 @@ message GeneratedSwiftReservedMessages {
   message numberValue { int32 numberValue = 1; }
   message objcClassPrefix { int32 objcClassPrefix = 1; }
   message of { int32 of = 1; }
-  message OneOf_Kind { int32 OneOf_Kind = 1; }
   message oneofDecl { int32 oneofDecl = 1; }
   message OneofDescriptorProto { int32 OneofDescriptorProto = 1; }
   message oneofIndex { int32 oneofIndex = 1; }
   message OneofOptions { int32 OneofOptions = 1; }
   message oneofs { int32 oneofs = 1; }
+  message OneOf_Kind { int32 OneOf_Kind = 1; }
   message optimizeFor { int32 optimizeFor = 1; }
   message OptimizeMode { int32 OptimizeMode = 1; }
   message Option { int32 Option = 1; }
@@ -746,14 +746,8 @@ message GeneratedSwiftReservedMessages {
   message proto2 { int32 proto2 = 1; }
   message proto3DefaultValue { int32 proto3DefaultValue = 1; }
   message proto3Optional { int32 proto3Optional = 1; }
-  message protobuf_extensionFieldValues { int32 protobuf_extensionFieldValues = 1; }
-  message protobuf_fieldNumber { int32 protobuf_fieldNumber = 1; }
-  message protobuf_generated_isEqualTo { int32 protobuf_generated_isEqualTo = 1; }
-  message protobuf_nameMap { int32 protobuf_nameMap = 1; }
-  message protobuf_newField { int32 protobuf_newField = 1; }
-  message protobuf_package { int32 protobuf_package = 1; }
-  message ProtobufAPIVersion_2 { int32 ProtobufAPIVersion_2 = 1; }
   message ProtobufAPIVersionCheck { int32 ProtobufAPIVersionCheck = 1; }
+  message ProtobufAPIVersion_2 { int32 ProtobufAPIVersion_2 = 1; }
   message ProtobufBool { int32 ProtobufBool = 1; }
   message ProtobufBytes { int32 ProtobufBytes = 1; }
   message ProtobufDouble { int32 ProtobufDouble = 1; }
@@ -773,6 +767,12 @@ message GeneratedSwiftReservedMessages {
   message ProtobufString { int32 ProtobufString = 1; }
   message ProtobufUInt32 { int32 ProtobufUInt32 = 1; }
   message ProtobufUInt64 { int32 ProtobufUInt64 = 1; }
+  message protobuf_extensionFieldValues { int32 protobuf_extensionFieldValues = 1; }
+  message protobuf_fieldNumber { int32 protobuf_fieldNumber = 1; }
+  message protobuf_generated_isEqualTo { int32 protobuf_generated_isEqualTo = 1; }
+  message protobuf_nameMap { int32 protobuf_nameMap = 1; }
+  message protobuf_newField { int32 protobuf_newField = 1; }
+  message protobuf_package { int32 protobuf_package = 1; }
   message protocol { int32 protocol = 1; }
   message protoFieldName { int32 protoFieldName = 1; }
   message protoMessageName { int32 protoMessageName = 1; }
@@ -953,7 +953,7 @@ message GeneratedSwiftReservedMessages {
   message utf8ToDouble { int32 utf8ToDouble = 1; }
   message utf8Validation { int32 utf8Validation = 1; }
   message UTF8View { int32 UTF8View = 1; }
-  message V { int32 V = 1; }
+  message v { int32 v = 1; }
   message value { int32 value = 1; }
   message valueField { int32 valueField = 1; }
   message values { int32 values = 1; }
@@ -961,14 +961,14 @@ message GeneratedSwiftReservedMessages {
   message var { int32 var = 1; }
   message verification { int32 verification = 1; }
   message VerificationState { int32 VerificationState = 1; }
-  message version { int32 version = 1; }
+  message Version { int32 Version = 1; }
   message versionString { int32 versionString = 1; }
   message visibility { int32 visibility = 1; }
   message VisibilityFeature { int32 VisibilityFeature = 1; }
   message visitExtensionFields { int32 visitExtensionFields = 1; }
   message visitExtensionFieldsAsMessageSet { int32 visitExtensionFieldsAsMessageSet = 1; }
   message visitMapField { int32 visitMapField = 1; }
-  message Visitor { int32 Visitor = 1; }
+  message visitor { int32 visitor = 1; }
   message visitPacked { int32 visitPacked = 1; }
   message visitPackedBoolField { int32 visitPackedBoolField = 1; }
   message visitPackedDoubleField { int32 visitPackedDoubleField = 1; }

+ 1 - 1
README.md

@@ -90,7 +90,7 @@ your project as explained below.
 
 To use Swift with Protocol buffers, you'll need:
 
-* A Swift 5.8 or later compiler (or, if building with Xcode, Xcode 14.3 or later
+* A Swift 5.10 or later compiler (or, if building with Xcode, Xcode 15.3 or later
   as required by the App Store). The Swift protobuf project is being developed
   and tested against the latest release version of Swift available from
   [Swift.org](https://swift.org)

+ 0 - 8
Reference/Conformance/conformance/test_protos/test_messages_edition2023.pb.swift

@@ -1243,15 +1243,11 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023: SwiftProtobuf.M
     var _groupLikeType: ProtobufTestMessages_Editions_TestAllTypesEdition2023.GroupLikeType? = nil
     var _delimitedField: ProtobufTestMessages_Editions_TestAllTypesEdition2023.GroupLikeType? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2010,15 +2006,11 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023.NestedMessage: S
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Editions_TestAllTypesEdition2023? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Reference/Conformance/editions/test_messages_proto2_editions.pb.swift

@@ -2560,15 +2560,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     var _fieldName18__: Int32? = nil
     var _messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3545,15 +3541,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.NestedMessage:
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4262,15 +4254,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2: Swift
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4632,15 +4620,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.Nested
     var _corecursive: ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2? = nil
     var _optionalCorecursive: ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/Conformance/editions/test_messages_proto3_editions.pb.swift

@@ -1465,15 +1465,11 @@ extension ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3: SwiftProtobuf
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2530,15 +2526,11 @@ extension ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3.NestedMessage:
     var _a: Int32 = 0
     var _corecursive: ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Reference/Conformance/google/protobuf/test_messages_proto2.pb.swift

@@ -2559,15 +2559,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     var _fieldName18__: Int32? = nil
     var _messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3544,15 +3540,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Proto2_TestAllTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4261,15 +4253,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4631,15 +4619,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedMessage:
     var _corecursive: ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2? = nil
     var _optionalCorecursive: ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/Conformance/google/protobuf/test_messages_proto3.pb.swift

@@ -1464,15 +1464,11 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2529,15 +2525,11 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftPro
     var _a: Int32 = 0
     var _corecursive: ProtobufTestMessages_Proto3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 24
Reference/SwiftProtobuf/google/protobuf/descriptor.pb.swift

@@ -3012,15 +3012,11 @@ extension Google_Protobuf_DescriptorProto: Message, _MessageImplementationBase,
     var _reservedName: [String] = []
     var _visibility: Google_Protobuf_SymbolVisibility? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3577,15 +3573,11 @@ extension Google_Protobuf_EnumDescriptorProto: Message, _MessageImplementationBa
     var _reservedName: [String] = []
     var _visibility: Google_Protobuf_SymbolVisibility? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3737,15 +3729,11 @@ extension Google_Protobuf_EnumValueDescriptorProto: Message, _MessageImplementat
     var _number: Int32? = nil
     var _options: Google_Protobuf_EnumValueOptions? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3997,15 +3985,11 @@ extension Google_Protobuf_FileOptions: Message, _MessageImplementationBase, _Pro
     var _features: Google_Protobuf_FeatureSet? = nil
     var _uninterpretedOption: [Google_Protobuf_UninterpretedOption] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4323,15 +4307,11 @@ extension Google_Protobuf_FieldOptions: Message, _MessageImplementationBase, _Pr
     var _featureSupport: Google_Protobuf_FieldOptions.FeatureSupport? = nil
     var _uninterpretedOption: [Google_Protobuf_UninterpretedOption] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5307,15 +5287,11 @@ extension Google_Protobuf_FeatureSetDefaults.FeatureSetEditionDefault: Message,
     var _overridableFeatures: Google_Protobuf_FeatureSet? = nil
     var _fixedFeatures: Google_Protobuf_FeatureSet? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_delimited.pb.swift

@@ -106,15 +106,11 @@ extension SwiftDescriptorTest_EditionsMessageForDelimited: SwiftProtobuf.Message
     var _delimitedField: SwiftDescriptorTest_EditionsMessageForDelimited? = nil
     var _lengthPrefixedField: SwiftDescriptorTest_EditionsMessageForDelimited? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Reference/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test.pb.swift

@@ -508,15 +508,11 @@ extension SDTTopLevelMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImple
     var _field2: Int32? = nil
     var _o: SDTTopLevelMessage.OneOf_O?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -665,15 +661,11 @@ extension SDTTopLevelMessage.SubMessage: SwiftProtobuf.Message, SwiftProtobuf._M
     var _field2: String? = nil
     var _field3: SDTTopLevelMessage.SubMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -755,15 +747,11 @@ extension SDTTopLevelMessage2: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
     var _left: SDTTopLevelMessage? = nil
     var _right: SDTTopLevelMessage2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift

@@ -539,15 +539,11 @@ extension EditionsUnittest_TestDelimited: SwiftProtobuf.Message, SwiftProtobuf._
     var _notgrouplikescope: EditionsUnittest_NotGroupLikeScope? = nil
     var _messageimport: EditionsUnittest_MessageImport? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/SwiftProtobufTests/fuzz_testing.pb.swift

@@ -3209,15 +3209,11 @@ extension SwiftProtoTesting_Fuzz_Message: SwiftProtobuf.Message, SwiftProtobuf._
     var _singularMessageSet: SwiftProtoTesting_Fuzz_AMessageSetMessage? = nil
     var _repeatedMessageSet: [SwiftProtoTesting_Fuzz_AMessageSetMessage] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 364 - 364
Reference/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift

@@ -407,60 +407,60 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case generatedCodeInfo // = 378
   case get // = 379
   case getExtensionValue // = 380
-  case googleProtobufAny // = 381
-  case googleProtobufApi // = 382
-  case googleProtobufBoolValue // = 383
-  case googleProtobufBytesValue // = 384
-  case googleProtobufDescriptorProto // = 385
-  case googleProtobufDoubleValue // = 386
-  case googleProtobufDuration // = 387
-  case googleProtobufEdition // = 388
-  case googleProtobufEmpty // = 389
-  case googleProtobufEnum // = 390
-  case googleProtobufEnumDescriptorProto // = 391
-  case googleProtobufEnumOptions // = 392
-  case googleProtobufEnumValue // = 393
-  case googleProtobufEnumValueDescriptorProto // = 394
-  case googleProtobufEnumValueOptions // = 395
-  case googleProtobufExtensionRangeOptions // = 396
-  case googleProtobufFeatureSet // = 397
-  case googleProtobufFeatureSetDefaults // = 398
-  case googleProtobufField // = 399
-  case googleProtobufFieldDescriptorProto // = 400
-  case googleProtobufFieldMask // = 401
-  case googleProtobufFieldOptions // = 402
-  case googleProtobufFileDescriptorProto // = 403
-  case googleProtobufFileDescriptorSet // = 404
-  case googleProtobufFileOptions // = 405
-  case googleProtobufFloatValue // = 406
-  case googleProtobufGeneratedCodeInfo // = 407
-  case googleProtobufInt32Value // = 408
-  case googleProtobufInt64Value // = 409
-  case googleProtobufListValue // = 410
-  case googleProtobufMessageOptions // = 411
-  case googleProtobufMethod // = 412
-  case googleProtobufMethodDescriptorProto // = 413
-  case googleProtobufMethodOptions // = 414
-  case googleProtobufMixin // = 415
-  case googleProtobufNullValue // = 416
-  case googleProtobufOneofDescriptorProto // = 417
-  case googleProtobufOneofOptions // = 418
-  case googleProtobufOption // = 419
-  case googleProtobufServiceDescriptorProto // = 420
-  case googleProtobufServiceOptions // = 421
-  case googleProtobufSourceCodeInfo // = 422
-  case googleProtobufSourceContext // = 423
-  case googleProtobufStringValue // = 424
-  case googleProtobufStruct // = 425
-  case googleProtobufSymbolVisibility // = 426
-  case googleProtobufSyntax // = 427
-  case googleProtobufTimestamp // = 428
-  case googleProtobufType // = 429
-  case googleProtobufUint32Value // = 430
-  case googleProtobufUint64Value // = 431
-  case googleProtobufUninterpretedOption // = 432
-  case googleProtobufValue // = 433
-  case googleapis // = 434
+  case googleapis // = 381
+  case googleProtobufAny // = 382
+  case googleProtobufApi // = 383
+  case googleProtobufBoolValue // = 384
+  case googleProtobufBytesValue // = 385
+  case googleProtobufDescriptorProto // = 386
+  case googleProtobufDoubleValue // = 387
+  case googleProtobufDuration // = 388
+  case googleProtobufEdition // = 389
+  case googleProtobufEmpty // = 390
+  case googleProtobufEnum // = 391
+  case googleProtobufEnumDescriptorProto // = 392
+  case googleProtobufEnumOptions // = 393
+  case googleProtobufEnumValue // = 394
+  case googleProtobufEnumValueDescriptorProto // = 395
+  case googleProtobufEnumValueOptions // = 396
+  case googleProtobufExtensionRangeOptions // = 397
+  case googleProtobufFeatureSet // = 398
+  case googleProtobufFeatureSetDefaults // = 399
+  case googleProtobufField // = 400
+  case googleProtobufFieldDescriptorProto // = 401
+  case googleProtobufFieldMask // = 402
+  case googleProtobufFieldOptions // = 403
+  case googleProtobufFileDescriptorProto // = 404
+  case googleProtobufFileDescriptorSet // = 405
+  case googleProtobufFileOptions // = 406
+  case googleProtobufFloatValue // = 407
+  case googleProtobufGeneratedCodeInfo // = 408
+  case googleProtobufInt32Value // = 409
+  case googleProtobufInt64Value // = 410
+  case googleProtobufListValue // = 411
+  case googleProtobufMessageOptions // = 412
+  case googleProtobufMethod // = 413
+  case googleProtobufMethodDescriptorProto // = 414
+  case googleProtobufMethodOptions // = 415
+  case googleProtobufMixin // = 416
+  case googleProtobufNullValue // = 417
+  case googleProtobufOneofDescriptorProto // = 418
+  case googleProtobufOneofOptions // = 419
+  case googleProtobufOption // = 420
+  case googleProtobufServiceDescriptorProto // = 421
+  case googleProtobufServiceOptions // = 422
+  case googleProtobufSourceCodeInfo // = 423
+  case googleProtobufSourceContext // = 424
+  case googleProtobufStringValue // = 425
+  case googleProtobufStruct // = 426
+  case googleProtobufSymbolVisibility // = 427
+  case googleProtobufSyntax // = 428
+  case googleProtobufTimestamp // = 429
+  case googleProtobufType // = 430
+  case googleProtobufUint32Value // = 431
+  case googleProtobufUint64Value // = 432
+  case googleProtobufUninterpretedOption // = 433
+  case googleProtobufValue // = 434
   case goPackage // = 435
   case gotData // = 436
   case group // = 437
@@ -718,12 +718,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case numberValue // = 689
   case objcClassPrefix // = 690
   case of // = 691
-  case oneOfKind // = 692
-  case oneofDecl // = 693
-  case oneofDescriptorProto // = 694
-  case oneofIndex // = 695
-  case oneofOptions // = 696
-  case oneofs // = 697
+  case oneofDecl // = 692
+  case oneofDescriptorProto // = 693
+  case oneofIndex // = 694
+  case oneofOptions // = 695
+  case oneofs // = 696
+  case oneOfKind // = 697
   case optimizeFor // = 698
   case optimizeMode // = 699
   case option // = 700
@@ -769,33 +769,33 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case proto2 // = 740
   case proto3DefaultValue // = 741
   case proto3Optional // = 742
-  case protobufExtensionFieldValues // = 743
-  case protobufFieldNumber // = 744
-  case protobufGeneratedIsEqualTo // = 745
-  case protobufNameMap // = 746
-  case protobufNewField // = 747
-  case protobufPackage // = 748
-  case protobufApiversion2 // = 749
-  case protobufApiversionCheck // = 750
-  case protobufBool // = 751
-  case protobufBytes // = 752
-  case protobufDouble // = 753
-  case protobufEnumMap // = 754
-  case protobufExtension // = 755
-  case protobufFixed32 // = 756
-  case protobufFixed64 // = 757
-  case protobufFloat // = 758
-  case protobufInt32 // = 759
-  case protobufInt64 // = 760
-  case protobufMap // = 761
-  case protobufMessageMap // = 762
-  case protobufSfixed32 // = 763
-  case protobufSfixed64 // = 764
-  case protobufSint32 // = 765
-  case protobufSint64 // = 766
-  case protobufString // = 767
-  case protobufUint32 // = 768
-  case protobufUint64 // = 769
+  case protobufApiversionCheck // = 743
+  case protobufApiversion2 // = 744
+  case protobufBool // = 745
+  case protobufBytes // = 746
+  case protobufDouble // = 747
+  case protobufEnumMap // = 748
+  case protobufExtension // = 749
+  case protobufFixed32 // = 750
+  case protobufFixed64 // = 751
+  case protobufFloat // = 752
+  case protobufInt32 // = 753
+  case protobufInt64 // = 754
+  case protobufMap // = 755
+  case protobufMessageMap // = 756
+  case protobufSfixed32 // = 757
+  case protobufSfixed64 // = 758
+  case protobufSint32 // = 759
+  case protobufSint64 // = 760
+  case protobufString // = 761
+  case protobufUint32 // = 762
+  case protobufUint64 // = 763
+  case protobufExtensionFieldValues // = 764
+  case protobufFieldNumber // = 765
+  case protobufGeneratedIsEqualTo // = 766
+  case protobufNameMap // = 767
+  case protobufNewField // = 768
+  case protobufPackage // = 769
   case `protocol` // = 770
   case protoFieldName // = 771
   case protoMessageName // = 772
@@ -1449,60 +1449,60 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 378: self = .generatedCodeInfo
     case 379: self = .get
     case 380: self = .getExtensionValue
-    case 381: self = .googleProtobufAny
-    case 382: self = .googleProtobufApi
-    case 383: self = .googleProtobufBoolValue
-    case 384: self = .googleProtobufBytesValue
-    case 385: self = .googleProtobufDescriptorProto
-    case 386: self = .googleProtobufDoubleValue
-    case 387: self = .googleProtobufDuration
-    case 388: self = .googleProtobufEdition
-    case 389: self = .googleProtobufEmpty
-    case 390: self = .googleProtobufEnum
-    case 391: self = .googleProtobufEnumDescriptorProto
-    case 392: self = .googleProtobufEnumOptions
-    case 393: self = .googleProtobufEnumValue
-    case 394: self = .googleProtobufEnumValueDescriptorProto
-    case 395: self = .googleProtobufEnumValueOptions
-    case 396: self = .googleProtobufExtensionRangeOptions
-    case 397: self = .googleProtobufFeatureSet
-    case 398: self = .googleProtobufFeatureSetDefaults
-    case 399: self = .googleProtobufField
-    case 400: self = .googleProtobufFieldDescriptorProto
-    case 401: self = .googleProtobufFieldMask
-    case 402: self = .googleProtobufFieldOptions
-    case 403: self = .googleProtobufFileDescriptorProto
-    case 404: self = .googleProtobufFileDescriptorSet
-    case 405: self = .googleProtobufFileOptions
-    case 406: self = .googleProtobufFloatValue
-    case 407: self = .googleProtobufGeneratedCodeInfo
-    case 408: self = .googleProtobufInt32Value
-    case 409: self = .googleProtobufInt64Value
-    case 410: self = .googleProtobufListValue
-    case 411: self = .googleProtobufMessageOptions
-    case 412: self = .googleProtobufMethod
-    case 413: self = .googleProtobufMethodDescriptorProto
-    case 414: self = .googleProtobufMethodOptions
-    case 415: self = .googleProtobufMixin
-    case 416: self = .googleProtobufNullValue
-    case 417: self = .googleProtobufOneofDescriptorProto
-    case 418: self = .googleProtobufOneofOptions
-    case 419: self = .googleProtobufOption
-    case 420: self = .googleProtobufServiceDescriptorProto
-    case 421: self = .googleProtobufServiceOptions
-    case 422: self = .googleProtobufSourceCodeInfo
-    case 423: self = .googleProtobufSourceContext
-    case 424: self = .googleProtobufStringValue
-    case 425: self = .googleProtobufStruct
-    case 426: self = .googleProtobufSymbolVisibility
-    case 427: self = .googleProtobufSyntax
-    case 428: self = .googleProtobufTimestamp
-    case 429: self = .googleProtobufType
-    case 430: self = .googleProtobufUint32Value
-    case 431: self = .googleProtobufUint64Value
-    case 432: self = .googleProtobufUninterpretedOption
-    case 433: self = .googleProtobufValue
-    case 434: self = .googleapis
+    case 381: self = .googleapis
+    case 382: self = .googleProtobufAny
+    case 383: self = .googleProtobufApi
+    case 384: self = .googleProtobufBoolValue
+    case 385: self = .googleProtobufBytesValue
+    case 386: self = .googleProtobufDescriptorProto
+    case 387: self = .googleProtobufDoubleValue
+    case 388: self = .googleProtobufDuration
+    case 389: self = .googleProtobufEdition
+    case 390: self = .googleProtobufEmpty
+    case 391: self = .googleProtobufEnum
+    case 392: self = .googleProtobufEnumDescriptorProto
+    case 393: self = .googleProtobufEnumOptions
+    case 394: self = .googleProtobufEnumValue
+    case 395: self = .googleProtobufEnumValueDescriptorProto
+    case 396: self = .googleProtobufEnumValueOptions
+    case 397: self = .googleProtobufExtensionRangeOptions
+    case 398: self = .googleProtobufFeatureSet
+    case 399: self = .googleProtobufFeatureSetDefaults
+    case 400: self = .googleProtobufField
+    case 401: self = .googleProtobufFieldDescriptorProto
+    case 402: self = .googleProtobufFieldMask
+    case 403: self = .googleProtobufFieldOptions
+    case 404: self = .googleProtobufFileDescriptorProto
+    case 405: self = .googleProtobufFileDescriptorSet
+    case 406: self = .googleProtobufFileOptions
+    case 407: self = .googleProtobufFloatValue
+    case 408: self = .googleProtobufGeneratedCodeInfo
+    case 409: self = .googleProtobufInt32Value
+    case 410: self = .googleProtobufInt64Value
+    case 411: self = .googleProtobufListValue
+    case 412: self = .googleProtobufMessageOptions
+    case 413: self = .googleProtobufMethod
+    case 414: self = .googleProtobufMethodDescriptorProto
+    case 415: self = .googleProtobufMethodOptions
+    case 416: self = .googleProtobufMixin
+    case 417: self = .googleProtobufNullValue
+    case 418: self = .googleProtobufOneofDescriptorProto
+    case 419: self = .googleProtobufOneofOptions
+    case 420: self = .googleProtobufOption
+    case 421: self = .googleProtobufServiceDescriptorProto
+    case 422: self = .googleProtobufServiceOptions
+    case 423: self = .googleProtobufSourceCodeInfo
+    case 424: self = .googleProtobufSourceContext
+    case 425: self = .googleProtobufStringValue
+    case 426: self = .googleProtobufStruct
+    case 427: self = .googleProtobufSymbolVisibility
+    case 428: self = .googleProtobufSyntax
+    case 429: self = .googleProtobufTimestamp
+    case 430: self = .googleProtobufType
+    case 431: self = .googleProtobufUint32Value
+    case 432: self = .googleProtobufUint64Value
+    case 433: self = .googleProtobufUninterpretedOption
+    case 434: self = .googleProtobufValue
     case 435: self = .goPackage
     case 436: self = .gotData
     case 437: self = .group
@@ -1760,12 +1760,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 689: self = .numberValue
     case 690: self = .objcClassPrefix
     case 691: self = .of
-    case 692: self = .oneOfKind
-    case 693: self = .oneofDecl
-    case 694: self = .oneofDescriptorProto
-    case 695: self = .oneofIndex
-    case 696: self = .oneofOptions
-    case 697: self = .oneofs
+    case 692: self = .oneofDecl
+    case 693: self = .oneofDescriptorProto
+    case 694: self = .oneofIndex
+    case 695: self = .oneofOptions
+    case 696: self = .oneofs
+    case 697: self = .oneOfKind
     case 698: self = .optimizeFor
     case 699: self = .optimizeMode
     case 700: self = .option
@@ -1811,33 +1811,33 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 740: self = .proto2
     case 741: self = .proto3DefaultValue
     case 742: self = .proto3Optional
-    case 743: self = .protobufExtensionFieldValues
-    case 744: self = .protobufFieldNumber
-    case 745: self = .protobufGeneratedIsEqualTo
-    case 746: self = .protobufNameMap
-    case 747: self = .protobufNewField
-    case 748: self = .protobufPackage
-    case 749: self = .protobufApiversion2
-    case 750: self = .protobufApiversionCheck
-    case 751: self = .protobufBool
-    case 752: self = .protobufBytes
-    case 753: self = .protobufDouble
-    case 754: self = .protobufEnumMap
-    case 755: self = .protobufExtension
-    case 756: self = .protobufFixed32
-    case 757: self = .protobufFixed64
-    case 758: self = .protobufFloat
-    case 759: self = .protobufInt32
-    case 760: self = .protobufInt64
-    case 761: self = .protobufMap
-    case 762: self = .protobufMessageMap
-    case 763: self = .protobufSfixed32
-    case 764: self = .protobufSfixed64
-    case 765: self = .protobufSint32
-    case 766: self = .protobufSint64
-    case 767: self = .protobufString
-    case 768: self = .protobufUint32
-    case 769: self = .protobufUint64
+    case 743: self = .protobufApiversionCheck
+    case 744: self = .protobufApiversion2
+    case 745: self = .protobufBool
+    case 746: self = .protobufBytes
+    case 747: self = .protobufDouble
+    case 748: self = .protobufEnumMap
+    case 749: self = .protobufExtension
+    case 750: self = .protobufFixed32
+    case 751: self = .protobufFixed64
+    case 752: self = .protobufFloat
+    case 753: self = .protobufInt32
+    case 754: self = .protobufInt64
+    case 755: self = .protobufMap
+    case 756: self = .protobufMessageMap
+    case 757: self = .protobufSfixed32
+    case 758: self = .protobufSfixed64
+    case 759: self = .protobufSint32
+    case 760: self = .protobufSint64
+    case 761: self = .protobufString
+    case 762: self = .protobufUint32
+    case 763: self = .protobufUint64
+    case 764: self = .protobufExtensionFieldValues
+    case 765: self = .protobufFieldNumber
+    case 766: self = .protobufGeneratedIsEqualTo
+    case 767: self = .protobufNameMap
+    case 768: self = .protobufNewField
+    case 769: self = .protobufPackage
     case 770: self = .protocol
     case 771: self = .protoFieldName
     case 772: self = .protoMessageName
@@ -2489,60 +2489,60 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .generatedCodeInfo: return 378
     case .get: return 379
     case .getExtensionValue: return 380
-    case .googleProtobufAny: return 381
-    case .googleProtobufApi: return 382
-    case .googleProtobufBoolValue: return 383
-    case .googleProtobufBytesValue: return 384
-    case .googleProtobufDescriptorProto: return 385
-    case .googleProtobufDoubleValue: return 386
-    case .googleProtobufDuration: return 387
-    case .googleProtobufEdition: return 388
-    case .googleProtobufEmpty: return 389
-    case .googleProtobufEnum: return 390
-    case .googleProtobufEnumDescriptorProto: return 391
-    case .googleProtobufEnumOptions: return 392
-    case .googleProtobufEnumValue: return 393
-    case .googleProtobufEnumValueDescriptorProto: return 394
-    case .googleProtobufEnumValueOptions: return 395
-    case .googleProtobufExtensionRangeOptions: return 396
-    case .googleProtobufFeatureSet: return 397
-    case .googleProtobufFeatureSetDefaults: return 398
-    case .googleProtobufField: return 399
-    case .googleProtobufFieldDescriptorProto: return 400
-    case .googleProtobufFieldMask: return 401
-    case .googleProtobufFieldOptions: return 402
-    case .googleProtobufFileDescriptorProto: return 403
-    case .googleProtobufFileDescriptorSet: return 404
-    case .googleProtobufFileOptions: return 405
-    case .googleProtobufFloatValue: return 406
-    case .googleProtobufGeneratedCodeInfo: return 407
-    case .googleProtobufInt32Value: return 408
-    case .googleProtobufInt64Value: return 409
-    case .googleProtobufListValue: return 410
-    case .googleProtobufMessageOptions: return 411
-    case .googleProtobufMethod: return 412
-    case .googleProtobufMethodDescriptorProto: return 413
-    case .googleProtobufMethodOptions: return 414
-    case .googleProtobufMixin: return 415
-    case .googleProtobufNullValue: return 416
-    case .googleProtobufOneofDescriptorProto: return 417
-    case .googleProtobufOneofOptions: return 418
-    case .googleProtobufOption: return 419
-    case .googleProtobufServiceDescriptorProto: return 420
-    case .googleProtobufServiceOptions: return 421
-    case .googleProtobufSourceCodeInfo: return 422
-    case .googleProtobufSourceContext: return 423
-    case .googleProtobufStringValue: return 424
-    case .googleProtobufStruct: return 425
-    case .googleProtobufSymbolVisibility: return 426
-    case .googleProtobufSyntax: return 427
-    case .googleProtobufTimestamp: return 428
-    case .googleProtobufType: return 429
-    case .googleProtobufUint32Value: return 430
-    case .googleProtobufUint64Value: return 431
-    case .googleProtobufUninterpretedOption: return 432
-    case .googleProtobufValue: return 433
-    case .googleapis: return 434
+    case .googleapis: return 381
+    case .googleProtobufAny: return 382
+    case .googleProtobufApi: return 383
+    case .googleProtobufBoolValue: return 384
+    case .googleProtobufBytesValue: return 385
+    case .googleProtobufDescriptorProto: return 386
+    case .googleProtobufDoubleValue: return 387
+    case .googleProtobufDuration: return 388
+    case .googleProtobufEdition: return 389
+    case .googleProtobufEmpty: return 390
+    case .googleProtobufEnum: return 391
+    case .googleProtobufEnumDescriptorProto: return 392
+    case .googleProtobufEnumOptions: return 393
+    case .googleProtobufEnumValue: return 394
+    case .googleProtobufEnumValueDescriptorProto: return 395
+    case .googleProtobufEnumValueOptions: return 396
+    case .googleProtobufExtensionRangeOptions: return 397
+    case .googleProtobufFeatureSet: return 398
+    case .googleProtobufFeatureSetDefaults: return 399
+    case .googleProtobufField: return 400
+    case .googleProtobufFieldDescriptorProto: return 401
+    case .googleProtobufFieldMask: return 402
+    case .googleProtobufFieldOptions: return 403
+    case .googleProtobufFileDescriptorProto: return 404
+    case .googleProtobufFileDescriptorSet: return 405
+    case .googleProtobufFileOptions: return 406
+    case .googleProtobufFloatValue: return 407
+    case .googleProtobufGeneratedCodeInfo: return 408
+    case .googleProtobufInt32Value: return 409
+    case .googleProtobufInt64Value: return 410
+    case .googleProtobufListValue: return 411
+    case .googleProtobufMessageOptions: return 412
+    case .googleProtobufMethod: return 413
+    case .googleProtobufMethodDescriptorProto: return 414
+    case .googleProtobufMethodOptions: return 415
+    case .googleProtobufMixin: return 416
+    case .googleProtobufNullValue: return 417
+    case .googleProtobufOneofDescriptorProto: return 418
+    case .googleProtobufOneofOptions: return 419
+    case .googleProtobufOption: return 420
+    case .googleProtobufServiceDescriptorProto: return 421
+    case .googleProtobufServiceOptions: return 422
+    case .googleProtobufSourceCodeInfo: return 423
+    case .googleProtobufSourceContext: return 424
+    case .googleProtobufStringValue: return 425
+    case .googleProtobufStruct: return 426
+    case .googleProtobufSymbolVisibility: return 427
+    case .googleProtobufSyntax: return 428
+    case .googleProtobufTimestamp: return 429
+    case .googleProtobufType: return 430
+    case .googleProtobufUint32Value: return 431
+    case .googleProtobufUint64Value: return 432
+    case .googleProtobufUninterpretedOption: return 433
+    case .googleProtobufValue: return 434
     case .goPackage: return 435
     case .gotData: return 436
     case .group: return 437
@@ -2803,12 +2803,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .numberValue: return 689
     case .objcClassPrefix: return 690
     case .of: return 691
-    case .oneOfKind: return 692
-    case .oneofDecl: return 693
-    case .oneofDescriptorProto: return 694
-    case .oneofIndex: return 695
-    case .oneofOptions: return 696
-    case .oneofs: return 697
+    case .oneofDecl: return 692
+    case .oneofDescriptorProto: return 693
+    case .oneofIndex: return 694
+    case .oneofOptions: return 695
+    case .oneofs: return 696
+    case .oneOfKind: return 697
     case .optimizeFor: return 698
     case .optimizeMode: return 699
     case .option: return 700
@@ -2854,33 +2854,33 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .proto2: return 740
     case .proto3DefaultValue: return 741
     case .proto3Optional: return 742
-    case .protobufExtensionFieldValues: return 743
-    case .protobufFieldNumber: return 744
-    case .protobufGeneratedIsEqualTo: return 745
-    case .protobufNameMap: return 746
-    case .protobufNewField: return 747
-    case .protobufPackage: return 748
-    case .protobufApiversion2: return 749
-    case .protobufApiversionCheck: return 750
-    case .protobufBool: return 751
-    case .protobufBytes: return 752
-    case .protobufDouble: return 753
-    case .protobufEnumMap: return 754
-    case .protobufExtension: return 755
-    case .protobufFixed32: return 756
-    case .protobufFixed64: return 757
-    case .protobufFloat: return 758
-    case .protobufInt32: return 759
-    case .protobufInt64: return 760
-    case .protobufMap: return 761
-    case .protobufMessageMap: return 762
-    case .protobufSfixed32: return 763
-    case .protobufSfixed64: return 764
-    case .protobufSint32: return 765
-    case .protobufSint64: return 766
-    case .protobufString: return 767
-    case .protobufUint32: return 768
-    case .protobufUint64: return 769
+    case .protobufApiversionCheck: return 743
+    case .protobufApiversion2: return 744
+    case .protobufBool: return 745
+    case .protobufBytes: return 746
+    case .protobufDouble: return 747
+    case .protobufEnumMap: return 748
+    case .protobufExtension: return 749
+    case .protobufFixed32: return 750
+    case .protobufFixed64: return 751
+    case .protobufFloat: return 752
+    case .protobufInt32: return 753
+    case .protobufInt64: return 754
+    case .protobufMap: return 755
+    case .protobufMessageMap: return 756
+    case .protobufSfixed32: return 757
+    case .protobufSfixed64: return 758
+    case .protobufSint32: return 759
+    case .protobufSint64: return 760
+    case .protobufString: return 761
+    case .protobufUint32: return 762
+    case .protobufUint64: return 763
+    case .protobufExtensionFieldValues: return 764
+    case .protobufFieldNumber: return 765
+    case .protobufGeneratedIsEqualTo: return 766
+    case .protobufNameMap: return 767
+    case .protobufNewField: return 768
+    case .protobufPackage: return 769
     case .protocol: return 770
     case .protoFieldName: return 771
     case .protoMessageName: return 772
@@ -3540,6 +3540,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .generatedCodeInfo,
     .get,
     .getExtensionValue,
+    .googleapis,
     .googleProtobufAny,
     .googleProtobufApi,
     .googleProtobufBoolValue,
@@ -3593,7 +3594,6 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .googleProtobufUint64Value,
     .googleProtobufUninterpretedOption,
     .googleProtobufValue,
-    .googleapis,
     .goPackage,
     .gotData,
     .group,
@@ -3851,12 +3851,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .numberValue,
     .objcClassPrefix,
     .of,
-    .oneOfKind,
     .oneofDecl,
     .oneofDescriptorProto,
     .oneofIndex,
     .oneofOptions,
     .oneofs,
+    .oneOfKind,
     .optimizeFor,
     .optimizeMode,
     .option,
@@ -3902,14 +3902,8 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .proto2,
     .proto3DefaultValue,
     .proto3Optional,
-    .protobufExtensionFieldValues,
-    .protobufFieldNumber,
-    .protobufGeneratedIsEqualTo,
-    .protobufNameMap,
-    .protobufNewField,
-    .protobufPackage,
-    .protobufApiversion2,
     .protobufApiversionCheck,
+    .protobufApiversion2,
     .protobufBool,
     .protobufBytes,
     .protobufDouble,
@@ -3929,6 +3923,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .protobufString,
     .protobufUint32,
     .protobufUint64,
+    .protobufExtensionFieldValues,
+    .protobufFieldNumber,
+    .protobufGeneratedIsEqualTo,
+    .protobufNameMap,
+    .protobufNewField,
+    .protobufPackage,
     .protocol,
     .protoFieldName,
     .protoMessageName,
@@ -4210,7 +4210,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     6: .same(proto: "alwaysPrintEnumsAsInts"),
     7: .same(proto: "alwaysPrintInt64sAsNumbers"),
     8: .same(proto: "annotation"),
-    9: .same(proto: "Any"),
+    9: .same(proto: "any"),
     10: .same(proto: "AnyExtensionField"),
     11: .same(proto: "AnyMessageExtension"),
     12: .same(proto: "AnyMessageStorage"),
@@ -4391,7 +4391,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     187: .same(proto: "customCodable"),
     188: .same(proto: "CustomDebugStringConvertible"),
     189: .same(proto: "CustomStringConvertible"),
-    190: .same(proto: "D"),
+    190: .same(proto: "d"),
     191: .same(proto: "Data"),
     192: .same(proto: "dataResult"),
     193: .same(proto: "date"),
@@ -4407,7 +4407,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     203: .same(proto: "decodeJSON"),
     204: .same(proto: "decodeMapField"),
     205: .same(proto: "decodeMessage"),
-    206: .same(proto: "Decoder"),
+    206: .same(proto: "decoder"),
     207: .same(proto: "decodeRepeated"),
     208: .same(proto: "decodeRepeatedBoolField"),
     209: .same(proto: "decodeRepeatedBytesField"),
@@ -4469,7 +4469,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     265: .same(proto: "discardUnknownFields"),
     266: .same(proto: "Double"),
     267: .same(proto: "doubleValue"),
-    268: .same(proto: "Duration"),
+    268: .same(proto: "duration"),
     269: .same(proto: "E"),
     270: .same(proto: "edition"),
     271: .same(proto: "EditionDefault"),
@@ -4582,60 +4582,60 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     378: .same(proto: "GeneratedCodeInfo"),
     379: .same(proto: "get"),
     380: .same(proto: "getExtensionValue"),
-    381: .same(proto: "Google_Protobuf_Any"),
-    382: .same(proto: "Google_Protobuf_Api"),
-    383: .same(proto: "Google_Protobuf_BoolValue"),
-    384: .same(proto: "Google_Protobuf_BytesValue"),
-    385: .same(proto: "Google_Protobuf_DescriptorProto"),
-    386: .same(proto: "Google_Protobuf_DoubleValue"),
-    387: .same(proto: "Google_Protobuf_Duration"),
-    388: .same(proto: "Google_Protobuf_Edition"),
-    389: .same(proto: "Google_Protobuf_Empty"),
-    390: .same(proto: "Google_Protobuf_Enum"),
-    391: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
-    392: .same(proto: "Google_Protobuf_EnumOptions"),
-    393: .same(proto: "Google_Protobuf_EnumValue"),
-    394: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
-    395: .same(proto: "Google_Protobuf_EnumValueOptions"),
-    396: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
-    397: .same(proto: "Google_Protobuf_FeatureSet"),
-    398: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
-    399: .same(proto: "Google_Protobuf_Field"),
-    400: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
-    401: .same(proto: "Google_Protobuf_FieldMask"),
-    402: .same(proto: "Google_Protobuf_FieldOptions"),
-    403: .same(proto: "Google_Protobuf_FileDescriptorProto"),
-    404: .same(proto: "Google_Protobuf_FileDescriptorSet"),
-    405: .same(proto: "Google_Protobuf_FileOptions"),
-    406: .same(proto: "Google_Protobuf_FloatValue"),
-    407: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
-    408: .same(proto: "Google_Protobuf_Int32Value"),
-    409: .same(proto: "Google_Protobuf_Int64Value"),
-    410: .same(proto: "Google_Protobuf_ListValue"),
-    411: .same(proto: "Google_Protobuf_MessageOptions"),
-    412: .same(proto: "Google_Protobuf_Method"),
-    413: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
-    414: .same(proto: "Google_Protobuf_MethodOptions"),
-    415: .same(proto: "Google_Protobuf_Mixin"),
-    416: .same(proto: "Google_Protobuf_NullValue"),
-    417: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
-    418: .same(proto: "Google_Protobuf_OneofOptions"),
-    419: .same(proto: "Google_Protobuf_Option"),
-    420: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
-    421: .same(proto: "Google_Protobuf_ServiceOptions"),
-    422: .same(proto: "Google_Protobuf_SourceCodeInfo"),
-    423: .same(proto: "Google_Protobuf_SourceContext"),
-    424: .same(proto: "Google_Protobuf_StringValue"),
-    425: .same(proto: "Google_Protobuf_Struct"),
-    426: .same(proto: "Google_Protobuf_SymbolVisibility"),
-    427: .same(proto: "Google_Protobuf_Syntax"),
-    428: .same(proto: "Google_Protobuf_Timestamp"),
-    429: .same(proto: "Google_Protobuf_Type"),
-    430: .same(proto: "Google_Protobuf_UInt32Value"),
-    431: .same(proto: "Google_Protobuf_UInt64Value"),
-    432: .same(proto: "Google_Protobuf_UninterpretedOption"),
-    433: .same(proto: "Google_Protobuf_Value"),
-    434: .same(proto: "googleapis"),
+    381: .same(proto: "googleapis"),
+    382: .same(proto: "Google_Protobuf_Any"),
+    383: .same(proto: "Google_Protobuf_Api"),
+    384: .same(proto: "Google_Protobuf_BoolValue"),
+    385: .same(proto: "Google_Protobuf_BytesValue"),
+    386: .same(proto: "Google_Protobuf_DescriptorProto"),
+    387: .same(proto: "Google_Protobuf_DoubleValue"),
+    388: .same(proto: "Google_Protobuf_Duration"),
+    389: .same(proto: "Google_Protobuf_Edition"),
+    390: .same(proto: "Google_Protobuf_Empty"),
+    391: .same(proto: "Google_Protobuf_Enum"),
+    392: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
+    393: .same(proto: "Google_Protobuf_EnumOptions"),
+    394: .same(proto: "Google_Protobuf_EnumValue"),
+    395: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
+    396: .same(proto: "Google_Protobuf_EnumValueOptions"),
+    397: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
+    398: .same(proto: "Google_Protobuf_FeatureSet"),
+    399: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
+    400: .same(proto: "Google_Protobuf_Field"),
+    401: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
+    402: .same(proto: "Google_Protobuf_FieldMask"),
+    403: .same(proto: "Google_Protobuf_FieldOptions"),
+    404: .same(proto: "Google_Protobuf_FileDescriptorProto"),
+    405: .same(proto: "Google_Protobuf_FileDescriptorSet"),
+    406: .same(proto: "Google_Protobuf_FileOptions"),
+    407: .same(proto: "Google_Protobuf_FloatValue"),
+    408: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
+    409: .same(proto: "Google_Protobuf_Int32Value"),
+    410: .same(proto: "Google_Protobuf_Int64Value"),
+    411: .same(proto: "Google_Protobuf_ListValue"),
+    412: .same(proto: "Google_Protobuf_MessageOptions"),
+    413: .same(proto: "Google_Protobuf_Method"),
+    414: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
+    415: .same(proto: "Google_Protobuf_MethodOptions"),
+    416: .same(proto: "Google_Protobuf_Mixin"),
+    417: .same(proto: "Google_Protobuf_NullValue"),
+    418: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
+    419: .same(proto: "Google_Protobuf_OneofOptions"),
+    420: .same(proto: "Google_Protobuf_Option"),
+    421: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
+    422: .same(proto: "Google_Protobuf_ServiceOptions"),
+    423: .same(proto: "Google_Protobuf_SourceCodeInfo"),
+    424: .same(proto: "Google_Protobuf_SourceContext"),
+    425: .same(proto: "Google_Protobuf_StringValue"),
+    426: .same(proto: "Google_Protobuf_Struct"),
+    427: .same(proto: "Google_Protobuf_SymbolVisibility"),
+    428: .same(proto: "Google_Protobuf_Syntax"),
+    429: .same(proto: "Google_Protobuf_Timestamp"),
+    430: .same(proto: "Google_Protobuf_Type"),
+    431: .same(proto: "Google_Protobuf_UInt32Value"),
+    432: .same(proto: "Google_Protobuf_UInt64Value"),
+    433: .same(proto: "Google_Protobuf_UninterpretedOption"),
+    434: .same(proto: "Google_Protobuf_Value"),
     435: .same(proto: "goPackage"),
     436: .same(proto: "gotData"),
     437: .same(proto: "group"),
@@ -4893,12 +4893,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     689: .same(proto: "numberValue"),
     690: .same(proto: "objcClassPrefix"),
     691: .same(proto: "of"),
-    692: .same(proto: "OneOf_Kind"),
-    693: .same(proto: "oneofDecl"),
-    694: .same(proto: "OneofDescriptorProto"),
-    695: .same(proto: "oneofIndex"),
-    696: .same(proto: "OneofOptions"),
-    697: .same(proto: "oneofs"),
+    692: .same(proto: "oneofDecl"),
+    693: .same(proto: "OneofDescriptorProto"),
+    694: .same(proto: "oneofIndex"),
+    695: .same(proto: "OneofOptions"),
+    696: .same(proto: "oneofs"),
+    697: .same(proto: "OneOf_Kind"),
     698: .same(proto: "optimizeFor"),
     699: .same(proto: "OptimizeMode"),
     700: .same(proto: "Option"),
@@ -4944,33 +4944,33 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     740: .same(proto: "proto2"),
     741: .same(proto: "proto3DefaultValue"),
     742: .same(proto: "proto3Optional"),
-    743: .same(proto: "protobuf_extensionFieldValues"),
-    744: .same(proto: "protobuf_fieldNumber"),
-    745: .same(proto: "protobuf_generated_isEqualTo"),
-    746: .same(proto: "protobuf_nameMap"),
-    747: .same(proto: "protobuf_newField"),
-    748: .same(proto: "protobuf_package"),
-    749: .same(proto: "ProtobufAPIVersion_2"),
-    750: .same(proto: "ProtobufAPIVersionCheck"),
-    751: .same(proto: "ProtobufBool"),
-    752: .same(proto: "ProtobufBytes"),
-    753: .same(proto: "ProtobufDouble"),
-    754: .same(proto: "ProtobufEnumMap"),
-    755: .same(proto: "protobufExtension"),
-    756: .same(proto: "ProtobufFixed32"),
-    757: .same(proto: "ProtobufFixed64"),
-    758: .same(proto: "ProtobufFloat"),
-    759: .same(proto: "ProtobufInt32"),
-    760: .same(proto: "ProtobufInt64"),
-    761: .same(proto: "ProtobufMap"),
-    762: .same(proto: "ProtobufMessageMap"),
-    763: .same(proto: "ProtobufSFixed32"),
-    764: .same(proto: "ProtobufSFixed64"),
-    765: .same(proto: "ProtobufSInt32"),
-    766: .same(proto: "ProtobufSInt64"),
-    767: .same(proto: "ProtobufString"),
-    768: .same(proto: "ProtobufUInt32"),
-    769: .same(proto: "ProtobufUInt64"),
+    743: .same(proto: "ProtobufAPIVersionCheck"),
+    744: .same(proto: "ProtobufAPIVersion_2"),
+    745: .same(proto: "ProtobufBool"),
+    746: .same(proto: "ProtobufBytes"),
+    747: .same(proto: "ProtobufDouble"),
+    748: .same(proto: "ProtobufEnumMap"),
+    749: .same(proto: "protobufExtension"),
+    750: .same(proto: "ProtobufFixed32"),
+    751: .same(proto: "ProtobufFixed64"),
+    752: .same(proto: "ProtobufFloat"),
+    753: .same(proto: "ProtobufInt32"),
+    754: .same(proto: "ProtobufInt64"),
+    755: .same(proto: "ProtobufMap"),
+    756: .same(proto: "ProtobufMessageMap"),
+    757: .same(proto: "ProtobufSFixed32"),
+    758: .same(proto: "ProtobufSFixed64"),
+    759: .same(proto: "ProtobufSInt32"),
+    760: .same(proto: "ProtobufSInt64"),
+    761: .same(proto: "ProtobufString"),
+    762: .same(proto: "ProtobufUInt32"),
+    763: .same(proto: "ProtobufUInt64"),
+    764: .same(proto: "protobuf_extensionFieldValues"),
+    765: .same(proto: "protobuf_fieldNumber"),
+    766: .same(proto: "protobuf_generated_isEqualTo"),
+    767: .same(proto: "protobuf_nameMap"),
+    768: .same(proto: "protobuf_newField"),
+    769: .same(proto: "protobuf_package"),
     770: .same(proto: "protocol"),
     771: .same(proto: "protoFieldName"),
     772: .same(proto: "protoMessageName"),
@@ -5151,7 +5151,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     947: .same(proto: "utf8ToDouble"),
     948: .same(proto: "utf8Validation"),
     949: .same(proto: "UTF8View"),
-    950: .same(proto: "V"),
+    950: .same(proto: "v"),
     951: .same(proto: "value"),
     952: .same(proto: "valueField"),
     953: .same(proto: "values"),
@@ -5159,14 +5159,14 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     955: .same(proto: "var"),
     956: .same(proto: "verification"),
     957: .same(proto: "VerificationState"),
-    958: .same(proto: "version"),
+    958: .same(proto: "Version"),
     959: .same(proto: "versionString"),
     960: .same(proto: "visibility"),
     961: .same(proto: "VisibilityFeature"),
     962: .same(proto: "visitExtensionFields"),
     963: .same(proto: "visitExtensionFieldsAsMessageSet"),
     964: .same(proto: "visitMapField"),
-    965: .same(proto: "Visitor"),
+    965: .same(proto: "visitor"),
     966: .same(proto: "visitPacked"),
     967: .same(proto: "visitPackedBoolField"),
     968: .same(proto: "visitPackedDoubleField"),

+ 325 - 325
Reference/SwiftProtobufTests/generated_swift_names_enums.pb.swift

@@ -271,7 +271,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum AnyEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum any: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneAny // = 0
     case UNRECOGNIZED(Int)
@@ -295,7 +295,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.AnyEnum] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.any] = [
       .noneAny,
     ]
 
@@ -5701,7 +5701,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum D: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum d: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneD // = 0
     case UNRECOGNIZED(Int)
@@ -5725,7 +5725,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.D] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.d] = [
       .noneD,
     ]
 
@@ -6181,7 +6181,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Decoder: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum decoder: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneDecoder // = 0
     case UNRECOGNIZED(Int)
@@ -6205,7 +6205,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Decoder] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.decoder] = [
       .noneDecoder,
     ]
 
@@ -8041,7 +8041,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Duration: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum duration: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneDuration // = 0
     case UNRECOGNIZED(Int)
@@ -8065,7 +8065,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration] = [
       .noneDuration,
     ]
 
@@ -11431,6 +11431,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum googleapis: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneGoogleapis // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneGoogleapis
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneGoogleapis
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneGoogleapis: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis] = [
+      .noneGoogleapis,
+    ]
+
+  }
+
   enum Google_Protobuf_Any: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneGoogleProtobufAny // = 0
@@ -13021,36 +13051,6 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum googleapis: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneGoogleapis // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneGoogleapis
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneGoogleapis
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneGoogleapis: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis] = [
-      .noneGoogleapis,
-    ]
-
-  }
-
   enum goPackage: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneGoPackage // = 0
@@ -20761,36 +20761,6 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum OneOf_Kind: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneOneOfKind // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneOneOfKind
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneOneOfKind
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneOneOfKind: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind] = [
-      .noneOneOfKind,
-    ]
-
-  }
-
   enum oneofDecl: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneOneofDecl // = 0
@@ -20941,6 +20911,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum OneOf_Kind: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneOneOfKind // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneOneOfKind
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneOneOfKind
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneOneOfKind: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind] = [
+      .noneOneOfKind,
+    ]
+
+  }
+
   enum optimizeFor: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneOptimizeFor // = 0
@@ -22291,182 +22291,32 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum protobuf_extensionFieldValues: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufExtensionFieldValues // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufExtensionFieldValues
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufExtensionFieldValues
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufExtensionFieldValues: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues] = [
-      .noneProtobufExtensionFieldValues,
-    ]
-
-  }
-
-  enum protobuf_fieldNumber: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufFieldNumber // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufFieldNumber
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufFieldNumber
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufFieldNumber: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber] = [
-      .noneProtobufFieldNumber,
-    ]
-
-  }
-
-  enum protobuf_generated_isEqualTo: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufGeneratedIsEqualTo // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufGeneratedIsEqualTo
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufGeneratedIsEqualTo
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufGeneratedIsEqualTo: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo] = [
-      .noneProtobufGeneratedIsEqualTo,
-    ]
-
-  }
-
-  enum protobuf_nameMap: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufNameMap // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufNameMap
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufNameMap
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufNameMap: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap] = [
-      .noneProtobufNameMap,
-    ]
-
-  }
-
-  enum protobuf_newField: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufNewField // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufNewField
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufNewField
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufNewField: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField] = [
-      .noneProtobufNewField,
-    ]
-
-  }
-
-  enum protobuf_package: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum ProtobufAPIVersionCheck: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
-    case noneProtobufPackage // = 0
+    case noneProtobufApiversionCheck // = 0
     case UNRECOGNIZED(Int)
 
     init() {
-      self = .noneProtobufPackage
+      self = .noneProtobufApiversionCheck
     }
 
     init?(rawValue: Int) {
       switch rawValue {
-      case 0: self = .noneProtobufPackage
+      case 0: self = .noneProtobufApiversionCheck
       default: self = .UNRECOGNIZED(rawValue)
       }
     }
 
     var rawValue: Int {
       switch self {
-      case .noneProtobufPackage: return 0
+      case .noneProtobufApiversionCheck: return 0
       case .UNRECOGNIZED(let i): return i
       }
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package] = [
-      .noneProtobufPackage,
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck] = [
+      .noneProtobufApiversionCheck,
     ]
 
   }
@@ -22501,36 +22351,6 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum ProtobufAPIVersionCheck: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufApiversionCheck // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufApiversionCheck
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufApiversionCheck
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufApiversionCheck: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck] = [
-      .noneProtobufApiversionCheck,
-    ]
-
-  }
-
   enum ProtobufBool: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneProtobufBool // = 0
@@ -23101,6 +22921,186 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum protobuf_extensionFieldValues: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufExtensionFieldValues // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufExtensionFieldValues
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufExtensionFieldValues
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufExtensionFieldValues: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues] = [
+      .noneProtobufExtensionFieldValues,
+    ]
+
+  }
+
+  enum protobuf_fieldNumber: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufFieldNumber // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufFieldNumber
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufFieldNumber
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufFieldNumber: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber] = [
+      .noneProtobufFieldNumber,
+    ]
+
+  }
+
+  enum protobuf_generated_isEqualTo: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufGeneratedIsEqualTo // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufGeneratedIsEqualTo
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufGeneratedIsEqualTo
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufGeneratedIsEqualTo: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo] = [
+      .noneProtobufGeneratedIsEqualTo,
+    ]
+
+  }
+
+  enum protobuf_nameMap: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufNameMap // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufNameMap
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufNameMap
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufNameMap: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap] = [
+      .noneProtobufNameMap,
+    ]
+
+  }
+
+  enum protobuf_newField: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufNewField // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufNewField
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufNewField
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufNewField: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField] = [
+      .noneProtobufNewField,
+    ]
+
+  }
+
+  enum protobuf_package: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufPackage // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufPackage
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufPackage
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufPackage: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package] = [
+      .noneProtobufPackage,
+    ]
+
+  }
+
   enum protocolEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneProtocol // = 0
@@ -28501,7 +28501,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum V: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum v: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneV // = 0
     case UNRECOGNIZED(Int)
@@ -28525,7 +28525,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.V] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.v] = [
       .noneV,
     ]
 
@@ -28741,7 +28741,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum version: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum Version: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneVersion // = 0
     case UNRECOGNIZED(Int)
@@ -28765,7 +28765,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.version] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Version] = [
       .noneVersion,
     ]
 
@@ -28951,7 +28951,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Visitor: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum visitor: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneVisitor // = 0
     case UNRECOGNIZED(Int)
@@ -28975,7 +28975,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Visitor] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.visitor] = [
       .noneVisitor,
     ]
 
@@ -31095,9 +31095,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.annotation: Sw
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.AnyEnum: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.any: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Any"),
+    0: .same(proto: "NONE_any"),
   ]
 }
 
@@ -32181,9 +32181,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.CustomStringCo
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.D: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.d: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_D"),
+    0: .same(proto: "NONE_d"),
   ]
 }
 
@@ -32277,9 +32277,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.decodeMessageE
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Decoder: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.decoder: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Decoder"),
+    0: .same(proto: "NONE_decoder"),
   ]
 }
 
@@ -32649,9 +32649,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.doubleValue: S
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Duration"),
+    0: .same(proto: "NONE_duration"),
   ]
 }
 
@@ -33327,6 +33327,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.getExtensionVa
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_googleapis"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Google_Protobuf_Any: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_Google_Protobuf_Any"),
@@ -33645,12 +33651,6 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Google_Protobu
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_googleapis"),
-  ]
-}
-
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.goPackage: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_goPackage"),
@@ -35193,12 +35193,6 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.of: SwiftProto
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_OneOf_Kind"),
-  ]
-}
-
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.oneofDecl: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_oneofDecl"),
@@ -35229,6 +35223,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.oneofs: SwiftP
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_OneOf_Kind"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.optimizeFor: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_optimizeFor"),
@@ -35499,39 +35499,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.proto3Optional
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_extensionFieldValues"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_fieldNumber"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_generated_isEqualTo"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_nameMap"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_newField"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_package"),
+    0: .same(proto: "NONE_ProtobufAPIVersionCheck"),
   ]
 }
 
@@ -35541,12 +35511,6 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVer
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_ProtobufAPIVersionCheck"),
-  ]
-}
-
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufBool: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_ProtobufBool"),
@@ -35661,6 +35625,42 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufUInt64
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_extensionFieldValues"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_fieldNumber"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_generated_isEqualTo"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_nameMap"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_newField"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_package"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protocolEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_protocol"),
@@ -36741,9 +36741,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.UTF8View: Swif
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.V: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.v: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_V"),
+    0: .same(proto: "NONE_v"),
   ]
 }
 
@@ -36789,9 +36789,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.VerificationSt
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.version: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Version: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_version"),
+    0: .same(proto: "NONE_Version"),
   ]
 }
 
@@ -36831,9 +36831,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.visitMapField:
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Visitor: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.visitor: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Visitor"),
+    0: .same(proto: "NONE_visitor"),
   ]
 }
 

File diff suppressed because it is too large
+ 346 - 350
Reference/SwiftProtobufTests/generated_swift_names_fields.pb.swift


File diff suppressed because it is too large
+ 173 - 365
Reference/SwiftProtobufTests/generated_swift_names_messages.pb.swift


+ 0 - 4
Reference/SwiftProtobufTests/map_unittest.pb.swift

@@ -279,15 +279,11 @@ extension SwiftProtoTesting_TestMap: SwiftProtobuf.Message, SwiftProtobuf._Messa
     var _mapStringForeignMessage: Dictionary<String,SwiftProtoTesting_ForeignMessage> = [:]
     var _mapInt32AllTypes: Dictionary<Int32,SwiftProtoTesting_TestAllTypes> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/SwiftProtobufTests/test_messages_proto3.pb.swift

@@ -1038,15 +1038,11 @@ extension SwiftProtoTesting_Test3_TestAllTypesProto3: SwiftProtobuf.Message, Swi
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1855,15 +1851,11 @@ extension SwiftProtoTesting_Test3_TestAllTypesProto3.NestedMessage: SwiftProtobu
     var _a: Int32 = 0
     var _corecursive: SwiftProtoTesting_Test3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 20
Reference/SwiftProtobufTests/unittest.pb.swift

@@ -4075,15 +4075,11 @@ extension SwiftProtoTesting_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._
     var _defaultCord: String? = nil
     var _oneofField: SwiftProtoTesting_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4760,15 +4756,11 @@ extension SwiftProtoTesting_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProt
     var _lazyChild: SwiftProtoTesting_NestedTestAllTypes? = nil
     var _eagerChild: SwiftProtoTesting_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5088,15 +5080,11 @@ extension SwiftProtoTesting_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._
     var _c: Int32? = nil
     var _optionalForeign: SwiftProtoTesting_ForeignMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5550,15 +5538,11 @@ extension SwiftProtoTesting_TestRecursiveMessage: SwiftProtobuf.Message, SwiftPr
     var _a: SwiftProtoTesting_TestRecursiveMessage? = nil
     var _i: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5790,15 +5774,11 @@ extension SwiftProtoTesting_TestExtremeDefaultValues: SwiftProtobuf.Message, Swi
     var _cordWithZero: String? = nil
     var _replacementString: String? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/SwiftProtobufTests/unittest_proto3.pb.swift

@@ -769,15 +769,11 @@ extension SwiftProtoTesting_Proto3_TestAllTypes: SwiftProtobuf.Message, SwiftPro
     var _repeatedLazyMessage: [SwiftProtoTesting_Proto3_TestAllTypes.NestedMessage] = []
     var _oneofField: SwiftProtoTesting_Proto3_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1455,15 +1451,11 @@ extension SwiftProtoTesting_Proto3_NestedTestAllTypes: SwiftProtobuf.Message, Sw
     var _child: SwiftProtoTesting_Proto3_NestedTestAllTypes? = nil
     var _payload: SwiftProtoTesting_Proto3_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/SwiftProtobufTests/unittest_proto3_optional.pb.swift

@@ -371,15 +371,11 @@ extension SwiftProtoTesting_TestProto3Optional: SwiftProtobuf.Message, SwiftProt
     var _singularInt32: Int32 = 0
     var _singularInt64: Int64 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift

@@ -783,15 +783,11 @@ extension SwiftProtoTesting_TestAllRequiredTypes: SwiftProtobuf.Message, SwiftPr
     var _defaultCord: String? = nil
     var _oneofField: SwiftProtoTesting_TestAllRequiredTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Reference/SwiftProtobufTests/unittest_swift_cycle.pb.swift

@@ -183,15 +183,11 @@ extension SwiftProtoTesting_CycleFoo: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _aBar: SwiftProtoTesting_CycleBar? = nil
     var _aBaz: SwiftProtoTesting_CycleBaz? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -275,15 +271,11 @@ extension SwiftProtoTesting_CycleBar: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _aBaz: SwiftProtoTesting_CycleBaz? = nil
     var _aFoo: SwiftProtoTesting_CycleFoo? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -367,15 +359,11 @@ extension SwiftProtoTesting_CycleBaz: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _aFoo: SwiftProtoTesting_CycleFoo? = nil
     var _aBar: SwiftProtoTesting_CycleBar? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/SwiftProtobufTests/unittest_swift_deprecated.pb.swift

@@ -415,15 +415,11 @@ extension SwiftProtoTesting_Deprecated_MyMsg: SwiftProtobuf.Message, SwiftProtob
     var _fixedField: [UInt32] = []
     var _msgField: SwiftProtoTesting_Deprecated_MyMsg? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -547,15 +543,11 @@ extension SwiftProtoTesting_Deprecated_MyMsg2: SwiftProtobuf.Message, SwiftProto
     var _fixedField: [UInt32] = []
     var _msgField: SwiftProtoTesting_Deprecated_MyMsg2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift

@@ -151,15 +151,11 @@ extension SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage: SwiftProto
     var _message: SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage? = nil
     var _optionalEnum: SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage.Enum? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/SwiftProtobufTests/unittest_swift_extension.pb.swift

@@ -642,15 +642,11 @@ extension SwiftProtoTesting_Extend_MsgUsesStorage: SwiftProtobuf.Message, SwiftP
     var _x: Int32? = nil
     var _y: SwiftProtoTesting_Extend_MsgUsesStorage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Reference/SwiftProtobufTests/unittest_swift_naming.pb.swift

@@ -12428,15 +12428,11 @@ extension SwiftProtoTesting_Names_FieldNames: SwiftProtobuf.Message, SwiftProtob
     var _extension: Int32? = nil
     var _extensions: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -22889,15 +22885,11 @@ extension SwiftProtoTesting_Names_FieldNamingInitials.Lowers: SwiftProtobuf.Mess
     var _theIDNumber: Int32? = nil
     var _requestID: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -23660,15 +23652,11 @@ extension SwiftProtoTesting_Names_SpecialNames3: SwiftProtobuf.Message, SwiftPro
     var _newValue: SwiftProtoTesting_Names_SpecialNames3.OneOf_NewValue?
     var _forcesStorage: SwiftProtoTesting_Names_SpecialNames3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -23751,15 +23739,11 @@ extension SwiftProtoTesting_Names_SpecialNames4: SwiftProtobuf.Message, SwiftPro
     var _newValue: String? = nil
     var _forcesStorage: SwiftProtoTesting_Names_SpecialNames4? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift

@@ -926,15 +926,11 @@ extension SwiftProtoTesting_Message2: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _mapInt32Enum: Dictionary<Int32,SwiftProtoTesting_Message2.Enum> = [:]
     var _mapInt32Message: Dictionary<Int32,SwiftProtoTesting_Message2> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1699,15 +1695,11 @@ extension SwiftProtoTesting_Msg2UsesStorage: SwiftProtobuf.Message, SwiftProtobu
   fileprivate class _StorageClass {
     var _y: SwiftProtoTesting_Msg2UsesStorage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/SwiftProtobufTests/unittest_swift_runtime_proto3.pb.swift

@@ -751,15 +751,11 @@ extension SwiftProtoTesting_Message3: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _mapInt32Enum: Dictionary<Int32,SwiftProtoTesting_Message3.Enum> = [:]
     var _mapInt32Message: Dictionary<Int32,SwiftProtoTesting_Message3> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1381,15 +1377,11 @@ extension SwiftProtoTesting_Msg3UsesStorage: SwiftProtobuf.Message, SwiftProtobu
   fileprivate class _StorageClass {
     var _y: SwiftProtoTesting_Msg3UsesStorage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Reference/SwiftProtobufTests/unittest_well_known_types.pb.swift

@@ -673,15 +673,11 @@ extension SwiftProtoTesting_TestWellKnownTypes: SwiftProtobuf.Message, SwiftProt
     var _bytesField: SwiftProtobuf.Google_Protobuf_BytesValue? = nil
     var _valueField: SwiftProtobuf.Google_Protobuf_Value? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -891,15 +887,11 @@ extension SwiftProtoTesting_RepeatedWellKnownTypes: SwiftProtobuf.Message, Swift
     var _stringField: [SwiftProtobuf.Google_Protobuf_StringValue] = []
     var _bytesField: [SwiftProtobuf.Google_Protobuf_BytesValue] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1457,15 +1449,11 @@ extension SwiftProtoTesting_MapWellKnownTypes: SwiftProtobuf.Message, SwiftProto
     var _stringField: Dictionary<Int32,SwiftProtobuf.Google_Protobuf_StringValue> = [:]
     var _bytesField: Dictionary<Int32,SwiftProtobuf.Google_Protobuf_BytesValue> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/conformance/test_protos/test_messages_edition2023.pb.swift

@@ -1243,15 +1243,11 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023: SwiftProtobuf.M
     var _groupLikeType: ProtobufTestMessages_Editions_TestAllTypesEdition2023.GroupLikeType? = nil
     var _delimitedField: ProtobufTestMessages_Editions_TestAllTypesEdition2023.GroupLikeType? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2010,15 +2006,11 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023.NestedMessage: S
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Editions_TestAllTypesEdition2023? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Reference/upstream/editions/golden/test_messages_proto2_editions.pb.swift

@@ -2560,15 +2560,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     var _fieldName18__: Int32? = nil
     var _messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3545,15 +3541,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.NestedMessage:
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4262,15 +4254,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2: Swift
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4632,15 +4620,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.Nested
     var _corecursive: ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2? = nil
     var _optionalCorecursive: ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/editions/golden/test_messages_proto3_editions.pb.swift

@@ -1465,15 +1465,11 @@ extension ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3: SwiftProtobuf
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2530,15 +2526,11 @@ extension ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3.NestedMessage:
     var _a: Int32 = 0
     var _corecursive: ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 24
Reference/upstream/google/protobuf/descriptor.pb.swift

@@ -3012,15 +3012,11 @@ extension Google_Protobuf_DescriptorProto: Message, _MessageImplementationBase,
     var _reservedName: [String] = []
     var _visibility: Google_Protobuf_SymbolVisibility? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3577,15 +3573,11 @@ extension Google_Protobuf_EnumDescriptorProto: Message, _MessageImplementationBa
     var _reservedName: [String] = []
     var _visibility: Google_Protobuf_SymbolVisibility? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3737,15 +3729,11 @@ extension Google_Protobuf_EnumValueDescriptorProto: Message, _MessageImplementat
     var _number: Int32? = nil
     var _options: Google_Protobuf_EnumValueOptions? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3997,15 +3985,11 @@ extension Google_Protobuf_FileOptions: Message, _MessageImplementationBase, _Pro
     var _features: Google_Protobuf_FeatureSet? = nil
     var _uninterpretedOption: [Google_Protobuf_UninterpretedOption] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4323,15 +4307,11 @@ extension Google_Protobuf_FieldOptions: Message, _MessageImplementationBase, _Pr
     var _featureSupport: Google_Protobuf_FieldOptions.FeatureSupport? = nil
     var _uninterpretedOption: [Google_Protobuf_UninterpretedOption] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5307,15 +5287,11 @@ extension Google_Protobuf_FeatureSetDefaults.FeatureSetEditionDefault: Message,
     var _overridableFeatures: Google_Protobuf_FeatureSet? = nil
     var _fixedFeatures: Google_Protobuf_FeatureSet? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 64
Reference/upstream/google/protobuf/edition_unittest.pb.swift

@@ -10192,15 +10192,11 @@ extension EditionUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Me
     var _defaultCord: String? = nil
     var _oneofField: EditionUnittest_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -10924,15 +10920,11 @@ extension EditionUnittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProtob
     var _lazyChild: EditionUnittest_NestedTestAllTypes? = nil
     var _eagerChild: EditionUnittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -11032,15 +11024,11 @@ extension EditionUnittest_TestDeprecatedFields: SwiftProtobuf.Message, SwiftProt
     var _oneofFields: EditionUnittest_TestDeprecatedFields.OneOf_OneofFields?
     var _nested: EditionUnittest_TestDeprecatedFields? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -12139,15 +12127,11 @@ extension EditionUnittest_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._Me
     var _c: Int32? = nil
     var _optionalForeign: EditionUnittest_ForeignMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -12550,15 +12534,11 @@ extension EditionUnittest_TestNestedRequiredForeign: SwiftProtobuf.Message, Swif
     var _requiredEnumMulti: EditionUnittest_TestRequiredEnumMulti? = nil
     var _requiredNoMask: EditionUnittest_TestRequiredNoMaskMulti? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -12922,15 +12902,11 @@ extension EditionUnittest_TestRecursiveMessage: SwiftProtobuf.Message, SwiftProt
     var _a: EditionUnittest_TestRecursiveMessage? = nil
     var _i: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13010,15 +12986,11 @@ extension EditionUnittest_TestMutualRecursionA: SwiftProtobuf.Message, SwiftProt
     var _subGroup: EditionUnittest_TestMutualRecursionA.SubGroup? = nil
     var _subGroupR: [EditionUnittest_TestMutualRecursionA.SubGroupR] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13098,15 +13070,11 @@ extension EditionUnittest_TestMutualRecursionA.SubMessage: SwiftProtobuf.Message
   fileprivate class _StorageClass {
     var _b: EditionUnittest_TestMutualRecursionB? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13176,15 +13144,11 @@ extension EditionUnittest_TestMutualRecursionA.SubGroup: SwiftProtobuf.Message,
     var _subMessage: EditionUnittest_TestMutualRecursionA.SubMessage? = nil
     var _notInThisScc: EditionUnittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13296,15 +13260,11 @@ extension EditionUnittest_TestMutualRecursionB: SwiftProtobuf.Message, SwiftProt
     var _a: EditionUnittest_TestMutualRecursionA? = nil
     var _optionalInt32: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -14254,15 +14214,11 @@ extension EditionUnittest_TestExtremeDefaultValues: SwiftProtobuf.Message, Swift
     var _cordWithZero: String? = nil
     var _replacementString: String? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -14720,15 +14676,11 @@ extension EditionUnittest_ManyOptionalString: SwiftProtobuf.Message, SwiftProtob
     var _str31: String? = nil
     var _str32: String? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -18475,15 +18427,11 @@ extension EditionUnittest_TestVerifyBigFieldNumberUint32.Nested: SwiftProtobuf.M
     var _optionalNested: EditionUnittest_TestVerifyBigFieldNumberUint32.Nested? = nil
     var _repeatedNested: [EditionUnittest_TestVerifyBigFieldNumberUint32.Nested] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -18677,15 +18625,11 @@ extension EditionUnittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf.
     var _packedArbitraryHifield: [EditionUnittest_EnumParseTester.Arbitrary] = []
     var _otherField: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -19349,15 +19293,11 @@ extension EditionUnittest_InlinedStringIdxRegressionProto: SwiftProtobuf.Message
     var _str2: String? = nil
     var _str3: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -19920,15 +19860,11 @@ extension EditionUnittest_TestMessageWithManyRepeatedPtrFields: SwiftProtobuf.Me
     var _repeatedString31: [String] = []
     var _repeatedString32: [String] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/google/protobuf/map_lite_unittest.pb.swift

@@ -499,15 +499,11 @@ extension Proto2Unittest_TestMapLite: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessageLite> = [:]
     var _teboring: Dictionary<Int32,Int32> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -705,15 +701,11 @@ extension Proto2Unittest_TestArenaMapLite: SwiftProtobuf.Message, SwiftProtobuf.
     var _mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnumLite> = [:]
     var _mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessageArenaLite> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/google/protobuf/map_unittest.pb.swift

@@ -504,15 +504,11 @@ extension Proto2Unittest_TestMap: SwiftProtobuf.Message, SwiftProtobuf._MessageI
     var _mapStringForeignMessage: Dictionary<String,Proto2Unittest_ForeignMessage> = [:]
     var _mapInt32AllTypes: Dictionary<Int32,Proto2Unittest_TestAllTypes> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -957,15 +953,11 @@ extension Proto2Unittest_TestArenaMap: SwiftProtobuf.Message, SwiftProtobuf._Mes
     var _mapInt32Enum: Dictionary<Int32,Proto2Unittest_MapEnum> = [:]
     var _mapInt32ForeignMessage: Dictionary<Int32,Proto2Unittest_ForeignMessage> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Reference/upstream/google/protobuf/sample_messages_edition.pb.swift

@@ -2376,15 +2376,11 @@ extension ProtobufTestMessages_Edition_TestAllTypesEdition: SwiftProtobuf.Messag
     var _fieldName17__: Int32? = nil
     var _fieldName18__: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3335,15 +3331,11 @@ extension ProtobufTestMessages_Edition_TestAllTypesEdition.NestedMessage: SwiftP
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Edition_TestAllTypesEdition? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3908,15 +3900,11 @@ extension ProtobufTestMessages_Edition_TestAllRequiredTypesEdition: SwiftProtobu
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4276,15 +4264,11 @@ extension ProtobufTestMessages_Edition_TestAllRequiredTypesEdition.NestedMessage
     var _corecursive: ProtobufTestMessages_Edition_TestAllRequiredTypesEdition? = nil
     var _optionalCorecursive: ProtobufTestMessages_Edition_TestAllRequiredTypesEdition? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Reference/upstream/google/protobuf/test_messages_proto2.pb.swift

@@ -2559,15 +2559,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     var _fieldName18__: Int32? = nil
     var _messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3544,15 +3540,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Proto2_TestAllTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4261,15 +4253,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4631,15 +4619,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedMessage:
     var _corecursive: ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2? = nil
     var _optionalCorecursive: ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/google/protobuf/test_messages_proto3.pb.swift

@@ -1464,15 +1464,11 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2529,15 +2525,11 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftPro
     var _a: Int32 = 0
     var _corecursive: ProtobufTestMessages_Proto3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 80
Reference/upstream/google/protobuf/unittest.pb.swift

@@ -11038,15 +11038,11 @@ extension Proto2Unittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Mes
     var _defaultCord: String? = nil
     var _oneofField: Proto2Unittest_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -11770,15 +11766,11 @@ extension Proto2Unittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProtobu
     var _lazyChild: Proto2Unittest_NestedTestAllTypes? = nil
     var _eagerChild: Proto2Unittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -11878,15 +11870,11 @@ extension Proto2Unittest_TestDeprecatedFields: SwiftProtobuf.Message, SwiftProto
     var _oneofFields: Proto2Unittest_TestDeprecatedFields.OneOf_OneofFields?
     var _nested: Proto2Unittest_TestDeprecatedFields? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13032,15 +13020,11 @@ extension Proto2Unittest_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._Mes
     var _c: Int32? = nil
     var _optionalForeign: Proto2Unittest_ForeignMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13443,15 +13427,11 @@ extension Proto2Unittest_TestNestedRequiredForeign: SwiftProtobuf.Message, Swift
     var _requiredEnumMulti: Proto2Unittest_TestRequiredEnumMulti? = nil
     var _requiredNoMask: Proto2Unittest_TestRequiredNoMaskMulti? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13815,15 +13795,11 @@ extension Proto2Unittest_TestRecursiveMessage: SwiftProtobuf.Message, SwiftProto
     var _a: Proto2Unittest_TestRecursiveMessage? = nil
     var _i: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13903,15 +13879,11 @@ extension Proto2Unittest_TestMutualRecursionA: SwiftProtobuf.Message, SwiftProto
     var _subGroup: Proto2Unittest_TestMutualRecursionA.SubGroup? = nil
     var _subGroupR: [Proto2Unittest_TestMutualRecursionA.SubGroupR] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -13991,15 +13963,11 @@ extension Proto2Unittest_TestMutualRecursionA.SubMessage: SwiftProtobuf.Message,
   fileprivate class _StorageClass {
     var _b: Proto2Unittest_TestMutualRecursionB? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -14069,15 +14037,11 @@ extension Proto2Unittest_TestMutualRecursionA.SubGroup: SwiftProtobuf.Message, S
     var _subMessage: Proto2Unittest_TestMutualRecursionA.SubMessage? = nil
     var _notInThisScc: Proto2Unittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -14189,15 +14153,11 @@ extension Proto2Unittest_TestMutualRecursionB: SwiftProtobuf.Message, SwiftProto
     var _a: Proto2Unittest_TestMutualRecursionA? = nil
     var _optionalInt32: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -15147,15 +15107,11 @@ extension Proto2Unittest_TestExtremeDefaultValues: SwiftProtobuf.Message, SwiftP
     var _cordWithZero: String? = nil
     var _replacementString: String? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -15613,15 +15569,11 @@ extension Proto2Unittest_ManyOptionalString: SwiftProtobuf.Message, SwiftProtobu
     var _str31: String? = nil
     var _str32: String? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -16673,15 +16625,11 @@ extension Proto2Unittest_TestOneof2.NestedMessage: SwiftProtobuf.Message, SwiftP
     var _corgeInt: [Int32] = []
     var _child: Proto2Unittest_TestOneof2.NestedMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -19480,15 +19428,11 @@ extension Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested: SwiftProtobuf.Me
     var _optionalNested: Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested? = nil
     var _repeatedNested: [Proto2Unittest_TestVerifyBigFieldNumberUint32.Nested] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -19682,15 +19626,11 @@ extension Proto2Unittest_EnumParseTester: SwiftProtobuf.Message, SwiftProtobuf._
     var _packedArbitraryHifield: [Proto2Unittest_EnumParseTester.Arbitrary] = []
     var _otherField: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -20353,15 +20293,11 @@ extension Proto2Unittest_InlinedStringIdxRegressionProto: SwiftProtobuf.Message,
     var _str2: String? = nil
     var _str3: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -20974,15 +20910,11 @@ extension Proto2Unittest_TestMessageWithManyRepeatedPtrFields: SwiftProtobuf.Mes
     var _repeatedString31: [String] = []
     var _repeatedString32: [String] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -21241,15 +21173,11 @@ extension Proto2Unittest_MessageCreatorZeroInit: SwiftProtobuf.Message, SwiftPro
     var _m: Proto2Unittest_MessageCreatorZeroInit? = nil
     var _one: Proto2Unittest_MessageCreatorZeroInit.OneOf_One?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -21393,15 +21321,11 @@ extension Proto2Unittest_MessageCreatorMemcpy: SwiftProtobuf.Message, SwiftProto
     var _m: Proto2Unittest_MessageCreatorMemcpy? = nil
     var _m2: Dictionary<Int32,Int32> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -21725,15 +21649,11 @@ extension Proto2Unittest_TestMessageForMove_Large: SwiftProtobuf.Message, SwiftP
     var _s118: [String] = []
     var _s119: [String] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/upstream/google/protobuf/unittest_custom_options.pb.swift

@@ -2489,15 +2489,11 @@ extension Proto2Unittest_Aggregate: SwiftProtobuf.Message, SwiftProtobuf._Messag
     var _mset: Proto2Unittest_AggregateMessageSet? = nil
     var _any: SwiftProtobuf.Google_Protobuf_Any? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/upstream/google/protobuf/unittest_delimited.pb.swift

@@ -539,15 +539,11 @@ extension EditionsUnittest_TestDelimited: SwiftProtobuf.Message, SwiftProtobuf._
     var _notgrouplikescope: EditionsUnittest_NotGroupLikeScope? = nil
     var _messageimport: EditionsUnittest_MessageImport? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/upstream/google/protobuf/unittest_enormous_descriptor.pb.swift

@@ -11060,15 +11060,11 @@ extension Proto2Unittest_TestEnormousDescriptor: SwiftProtobuf.Message, SwiftPro
     var _longFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong999: String? = nil
     var _longFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1000: String? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/upstream/google/protobuf/unittest_features.pb.swift

@@ -569,15 +569,11 @@ extension Pb_TestFeatures: SwiftProtobuf.Message, SwiftProtobuf._MessageImplemen
     var _legacyFeature: Pb_EnumFeature? = nil
     var _valueLifetimeFeature: Pb_ValueLifetimeFeature? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/upstream/google/protobuf/unittest_legacy_features.pb.swift

@@ -74,15 +74,11 @@ extension LegacyFeaturesUnittest_TestEditionsMessage: SwiftProtobuf.Message, Swi
     var _requiredField: Int32? = nil
     var _delimitedField: LegacyFeaturesUnittest_TestEditionsMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Reference/upstream/google/protobuf/unittest_lite.pb.swift

@@ -3505,15 +3505,11 @@ extension Proto2Unittest_TestAllTypesLite: SwiftProtobuf.Message, SwiftProtobuf.
     var _oneofField: Proto2Unittest_TestAllTypesLite.OneOf_OneofField?
     var _deceptivelyNamedList: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4575,15 +4571,11 @@ extension Proto2Unittest_TestDeprecatedLite: SwiftProtobuf.Message, SwiftProtobu
     var _deprecatedField3: String? = nil
     var _deprecatedField4: Proto2Unittest_TestDeprecatedLite? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5681,15 +5673,11 @@ extension Proto2Unittest_RecursiveMessage: SwiftProtobuf.Message, SwiftProtobuf.
     var _recurse: Proto2Unittest_RecursiveMessage? = nil
     var _payload: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5763,15 +5751,11 @@ extension Proto2Unittest_RecursiveGroup: SwiftProtobuf.Message, SwiftProtobuf._M
   fileprivate class _StorageClass {
     var _recurse: Proto2Unittest_RecursiveGroup? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/google/protobuf/unittest_mset.pb.swift

@@ -430,15 +430,11 @@ extension Proto2Unittest_NestedTestMessageSetContainer: SwiftProtobuf.Message, S
     var _child: Proto2Unittest_NestedTestMessageSetContainer? = nil
     var _lazyChild: Proto2Unittest_NestedTestMessageSetContainer? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -531,15 +527,11 @@ extension Proto2Unittest_NestedTestInt: SwiftProtobuf.Message, SwiftProtobuf._Me
     var _b: Int32? = nil
     var _child: Proto2Unittest_NestedTestInt? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/upstream/google/protobuf/unittest_no_field_presence.pb.swift

@@ -623,15 +623,11 @@ extension Proto2NofieldpresenceUnittest_TestAllTypes: SwiftProtobuf.Message, Swi
     var _repeatedLazyMessage: [Proto2NofieldpresenceUnittest_TestAllTypes.NestedMessage] = []
     var _oneofField: Proto2NofieldpresenceUnittest_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Reference/upstream/google/protobuf/unittest_proto3.pb.swift

@@ -1184,15 +1184,11 @@ extension Proto3Unittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._Mes
     var _repeatedLazyMessage: [Proto3Unittest_TestAllTypes.NestedMessage] = []
     var _oneofField: Proto3Unittest_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1870,15 +1866,11 @@ extension Proto3Unittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProtobu
     var _child: Proto3Unittest_NestedTestAllTypes? = nil
     var _payload: Proto3Unittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2225,15 +2217,11 @@ extension Proto3Unittest_TestHasbits: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _b69: Bool = false
     var _child: Proto3Unittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/google/protobuf/unittest_proto3_arena.pb.swift

@@ -953,15 +953,11 @@ extension Proto3ArenaUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf
     var _repeatedLazyMessage: [Proto3ArenaUnittest_TestAllTypes.NestedMessage] = []
     var _oneofField: Proto3ArenaUnittest_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1739,15 +1735,11 @@ extension Proto3ArenaUnittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftPr
     var _repeatedChild: [Proto3ArenaUnittest_NestedTestAllTypes] = []
     var _lazyPayload: Proto3ArenaUnittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/google/protobuf/unittest_proto3_arena_lite.pb.swift

@@ -702,15 +702,11 @@ extension Proto3ArenaLiteUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProt
     var _repeatedLazyMessage: [Proto3ArenaLiteUnittest_TestAllTypes.NestedMessage] = []
     var _oneofField: Proto3ArenaLiteUnittest_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1376,15 +1372,11 @@ extension Proto3ArenaLiteUnittest_NestedTestAllTypes: SwiftProtobuf.Message, Swi
     var _child: Proto3ArenaLiteUnittest_NestedTestAllTypes? = nil
     var _payload: Proto3ArenaLiteUnittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Reference/upstream/google/protobuf/unittest_proto3_lite.pb.swift

@@ -702,15 +702,11 @@ extension Proto3LiteUnittest_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf.
     var _repeatedLazyMessage: [Proto3LiteUnittest_TestAllTypes.NestedMessage] = []
     var _oneofField: Proto3LiteUnittest_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1376,15 +1372,11 @@ extension Proto3LiteUnittest_NestedTestAllTypes: SwiftProtobuf.Message, SwiftPro
     var _child: Proto3LiteUnittest_NestedTestAllTypes? = nil
     var _payload: Proto3LiteUnittest_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Reference/upstream/google/protobuf/unittest_proto3_optional.pb.swift

@@ -473,15 +473,11 @@ extension Proto2Unittest_TestProto3Optional: SwiftProtobuf.Message, SwiftProtobu
     var _singularInt32: Int32 = 0
     var _singularInt64: Int64 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Reference/upstream/google/protobuf/unittest_well_known_types.pb.swift

@@ -650,15 +650,11 @@ extension Proto2Unittest_TestWellKnownTypes: SwiftProtobuf.Message, SwiftProtobu
     var _bytesField: SwiftProtobuf.Google_Protobuf_BytesValue? = nil
     var _valueField: SwiftProtobuf.Google_Protobuf_Value? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -868,15 +864,11 @@ extension Proto2Unittest_RepeatedWellKnownTypes: SwiftProtobuf.Message, SwiftPro
     var _stringField: [SwiftProtobuf.Google_Protobuf_StringValue] = []
     var _bytesField: [SwiftProtobuf.Google_Protobuf_BytesValue] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1434,15 +1426,11 @@ extension Proto2Unittest_MapWellKnownTypes: SwiftProtobuf.Message, SwiftProtobuf
     var _stringField: Dictionary<Int32,SwiftProtobuf.Google_Protobuf_StringValue> = [:]
     var _bytesField: Dictionary<Int32,SwiftProtobuf.Google_Protobuf_BytesValue> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Sources/Conformance/test_messages_edition2023.pb.swift

@@ -1243,15 +1243,11 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023: SwiftProtobuf.M
     var _groupLikeType: ProtobufTestMessages_Editions_TestAllTypesEdition2023.GroupLikeType? = nil
     var _delimitedField: ProtobufTestMessages_Editions_TestAllTypesEdition2023.GroupLikeType? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2010,15 +2006,11 @@ extension ProtobufTestMessages_Editions_TestAllTypesEdition2023.NestedMessage: S
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Editions_TestAllTypesEdition2023? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Sources/Conformance/test_messages_proto2.pb.swift

@@ -2559,15 +2559,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
     var _fieldName18__: Int32? = nil
     var _messageSetCorrect: ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3544,15 +3540,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Proto2_TestAllTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4261,15 +4253,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4631,15 +4619,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedMessage:
     var _corecursive: ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2? = nil
     var _optionalCorecursive: ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Sources/Conformance/test_messages_proto2_editions.pb.swift

@@ -2560,15 +2560,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2: SwiftProtobuf
     var _fieldName18__: Int32? = nil
     var _messageSetCorrect: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.MessageSetCorrect? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3545,15 +3541,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2.NestedMessage:
     var _a: Int32? = nil
     var _corecursive: ProtobufTestMessages_Editions_Proto2_TestAllTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4262,15 +4254,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2: Swift
     var _defaultString: String? = nil
     var _defaultBytes: Data? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4632,15 +4620,11 @@ extension ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2.Nested
     var _corecursive: ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2? = nil
     var _optionalCorecursive: ProtobufTestMessages_Editions_Proto2_TestAllRequiredTypesProto2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Sources/Conformance/test_messages_proto3.pb.swift

@@ -1464,15 +1464,11 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3: SwiftProtobuf.Message,
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2529,15 +2525,11 @@ extension ProtobufTestMessages_Proto3_TestAllTypesProto3.NestedMessage: SwiftPro
     var _a: Int32 = 0
     var _corecursive: ProtobufTestMessages_Proto3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Sources/Conformance/test_messages_proto3_editions.pb.swift

@@ -1465,15 +1465,11 @@ extension ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3: SwiftProtobuf
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -2530,15 +2526,11 @@ extension ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3.NestedMessage:
     var _a: Int32 = 0
     var _corecursive: ProtobufTestMessages_Editions_Proto3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Sources/SwiftProtobuf/AnyMessageStorage.swift

@@ -145,15 +145,11 @@ internal class AnyMessageStorage {
     }
     var state: InternalState = .binary(Data())
 
-    #if swift(>=5.10)
     // This property is used as the initial default value for new instances of the type.
     // The type itself is protecting the reference to its storage via CoW semantics.
     // This will force a copy to be made of this reference when the first mutation occurs;
     // hence, it is safe to mark this as `nonisolated(unsafe)`.
     static nonisolated(unsafe) let defaultInstance = AnyMessageStorage()
-    #else
-    static let defaultInstance = AnyMessageStorage()
-    #endif
 
     private init() {}
 

+ 1 - 3
Sources/SwiftProtobuf/UnknownStorage.swift

@@ -21,9 +21,7 @@ import Foundation
 /// implementation or were valid field numbers but with mismatching wire
 /// formats (for example, a field encoded as a varint when a fixed32 integer
 /// was expected).
-public struct UnknownStorage: Equatable, @unchecked Sendable {
-    // Once swift(>=5.9) the '@unchecked' can be removed, it is needed for Data in
-    // linux builds.
+public struct UnknownStorage: Equatable, Sendable {
 
     /// The raw protocol buffer binary-encoded bytes that represent the unknown
     /// fields of a decoded message.

+ 0 - 24
Sources/SwiftProtobuf/descriptor.pb.swift

@@ -3012,15 +3012,11 @@ extension Google_Protobuf_DescriptorProto: Message, _MessageImplementationBase,
     var _reservedName: [String] = []
     var _visibility: Google_Protobuf_SymbolVisibility? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3577,15 +3573,11 @@ extension Google_Protobuf_EnumDescriptorProto: Message, _MessageImplementationBa
     var _reservedName: [String] = []
     var _visibility: Google_Protobuf_SymbolVisibility? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3737,15 +3729,11 @@ extension Google_Protobuf_EnumValueDescriptorProto: Message, _MessageImplementat
     var _number: Int32? = nil
     var _options: Google_Protobuf_EnumValueOptions? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -3997,15 +3985,11 @@ extension Google_Protobuf_FileOptions: Message, _MessageImplementationBase, _Pro
     var _features: Google_Protobuf_FeatureSet? = nil
     var _uninterpretedOption: [Google_Protobuf_UninterpretedOption] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4323,15 +4307,11 @@ extension Google_Protobuf_FieldOptions: Message, _MessageImplementationBase, _Pr
     var _featureSupport: Google_Protobuf_FieldOptions.FeatureSupport? = nil
     var _uninterpretedOption: [Google_Protobuf_UninterpretedOption] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5307,15 +5287,11 @@ extension Google_Protobuf_FeatureSetDefaults.FeatureSetEditionDefault: Message,
     var _overridableFeatures: Google_Protobuf_FeatureSet? = nil
     var _fixedFeatures: Google_Protobuf_FeatureSet? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 1 - 1
Sources/SwiftProtobufPluginLibrary/Google_Protobuf_Edition+Extensions.swift

@@ -18,7 +18,7 @@ import SwiftProtobuf
 /// The spec for editions calls out them being ordered and comparable.
 /// https://github.com/protocolbuffers/protobuf/blob/main/docs/design/editions/edition-naming.md
 #if compiler(>=6)
-extension Google_Protobuf_Edition: @retroactive Comparable {
+extension Google_Protobuf_Edition: Comparable {
     public static func < (lhs: Google_Protobuf_Edition, rhs: Google_Protobuf_Edition) -> Bool {
         lhs.rawValue < rhs.rawValue
     }

+ 0 - 4
Sources/protoc-gen-swift/MessageStorageClassGenerator.swift

@@ -50,15 +50,11 @@ class MessageStorageClassGenerator {
             p.print(
                 """
 
-                #if swift(>=5.10)
                   // This property is used as the initial default value for new instances of the type.
                   // The type itself is protecting the reference to its storage via CoW semantics.
                   // This will force a copy to be made of this reference when the first mutation occurs;
                   // hence, it is safe to mark this as `nonisolated(unsafe)`.
                   static nonisolated(unsafe) let defaultInstance = _StorageClass()
-                #else
-                  static let defaultInstance = _StorageClass()
-                #endif
 
                 private init() {}
 

+ 0 - 4
Tests/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_delimited.pb.swift

@@ -106,15 +106,11 @@ extension SwiftDescriptorTest_EditionsMessageForDelimited: SwiftProtobuf.Message
     var _delimitedField: SwiftDescriptorTest_EditionsMessageForDelimited? = nil
     var _lengthPrefixedField: SwiftDescriptorTest_EditionsMessageForDelimited? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Tests/SwiftProtobufPluginLibraryTests/pluginlib_descriptor_test.pb.swift

@@ -508,15 +508,11 @@ extension SDTTopLevelMessage: SwiftProtobuf.Message, SwiftProtobuf._MessageImple
     var _field2: Int32? = nil
     var _o: SDTTopLevelMessage.OneOf_O?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -665,15 +661,11 @@ extension SDTTopLevelMessage.SubMessage: SwiftProtobuf.Message, SwiftProtobuf._M
     var _field2: String? = nil
     var _field3: SDTTopLevelMessage.SubMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -755,15 +747,11 @@ extension SDTTopLevelMessage2: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
     var _left: SDTTopLevelMessage? = nil
     var _right: SDTTopLevelMessage2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Tests/SwiftProtobufPluginLibraryTests/unittest_delimited.pb.swift

@@ -539,15 +539,11 @@ extension EditionsUnittest_TestDelimited: SwiftProtobuf.Message, SwiftProtobuf._
     var _notgrouplikescope: EditionsUnittest_NotGroupLikeScope? = nil
     var _messageimport: EditionsUnittest_MessageImport? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 2 - 2
Tests/SwiftProtobufTests/Test_Any.swift

@@ -1251,8 +1251,8 @@ struct ConflictingImportMessage:
     SwiftProtobuf.Message,
     SwiftProtobuf._MessageImplementationBase,
     SwiftProtobuf._ProtoNameProviding,
-    @unchecked Sendable
-{  // Once swift(>=5.9) the '@unchecked' can be removed, it is needed for Data on linux.
+    Sendable
+{
     static let protoMessageName: String = "swift_proto_testing.import.ImportMessage"
 
     var unknownFields = SwiftProtobuf.UnknownStorage()

+ 0 - 4
Tests/SwiftProtobufTests/fuzz_testing.pb.swift

@@ -3209,15 +3209,11 @@ extension SwiftProtoTesting_Fuzz_Message: SwiftProtobuf.Message, SwiftProtobuf._
     var _singularMessageSet: SwiftProtoTesting_Fuzz_AMessageSetMessage? = nil
     var _repeatedMessageSet: [SwiftProtoTesting_Fuzz_AMessageSetMessage] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 364 - 364
Tests/SwiftProtobufTests/generated_swift_names_enum_cases.pb.swift

@@ -407,60 +407,60 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case generatedCodeInfo // = 378
   case get // = 379
   case getExtensionValue // = 380
-  case googleProtobufAny // = 381
-  case googleProtobufApi // = 382
-  case googleProtobufBoolValue // = 383
-  case googleProtobufBytesValue // = 384
-  case googleProtobufDescriptorProto // = 385
-  case googleProtobufDoubleValue // = 386
-  case googleProtobufDuration // = 387
-  case googleProtobufEdition // = 388
-  case googleProtobufEmpty // = 389
-  case googleProtobufEnum // = 390
-  case googleProtobufEnumDescriptorProto // = 391
-  case googleProtobufEnumOptions // = 392
-  case googleProtobufEnumValue // = 393
-  case googleProtobufEnumValueDescriptorProto // = 394
-  case googleProtobufEnumValueOptions // = 395
-  case googleProtobufExtensionRangeOptions // = 396
-  case googleProtobufFeatureSet // = 397
-  case googleProtobufFeatureSetDefaults // = 398
-  case googleProtobufField // = 399
-  case googleProtobufFieldDescriptorProto // = 400
-  case googleProtobufFieldMask // = 401
-  case googleProtobufFieldOptions // = 402
-  case googleProtobufFileDescriptorProto // = 403
-  case googleProtobufFileDescriptorSet // = 404
-  case googleProtobufFileOptions // = 405
-  case googleProtobufFloatValue // = 406
-  case googleProtobufGeneratedCodeInfo // = 407
-  case googleProtobufInt32Value // = 408
-  case googleProtobufInt64Value // = 409
-  case googleProtobufListValue // = 410
-  case googleProtobufMessageOptions // = 411
-  case googleProtobufMethod // = 412
-  case googleProtobufMethodDescriptorProto // = 413
-  case googleProtobufMethodOptions // = 414
-  case googleProtobufMixin // = 415
-  case googleProtobufNullValue // = 416
-  case googleProtobufOneofDescriptorProto // = 417
-  case googleProtobufOneofOptions // = 418
-  case googleProtobufOption // = 419
-  case googleProtobufServiceDescriptorProto // = 420
-  case googleProtobufServiceOptions // = 421
-  case googleProtobufSourceCodeInfo // = 422
-  case googleProtobufSourceContext // = 423
-  case googleProtobufStringValue // = 424
-  case googleProtobufStruct // = 425
-  case googleProtobufSymbolVisibility // = 426
-  case googleProtobufSyntax // = 427
-  case googleProtobufTimestamp // = 428
-  case googleProtobufType // = 429
-  case googleProtobufUint32Value // = 430
-  case googleProtobufUint64Value // = 431
-  case googleProtobufUninterpretedOption // = 432
-  case googleProtobufValue // = 433
-  case googleapis // = 434
+  case googleapis // = 381
+  case googleProtobufAny // = 382
+  case googleProtobufApi // = 383
+  case googleProtobufBoolValue // = 384
+  case googleProtobufBytesValue // = 385
+  case googleProtobufDescriptorProto // = 386
+  case googleProtobufDoubleValue // = 387
+  case googleProtobufDuration // = 388
+  case googleProtobufEdition // = 389
+  case googleProtobufEmpty // = 390
+  case googleProtobufEnum // = 391
+  case googleProtobufEnumDescriptorProto // = 392
+  case googleProtobufEnumOptions // = 393
+  case googleProtobufEnumValue // = 394
+  case googleProtobufEnumValueDescriptorProto // = 395
+  case googleProtobufEnumValueOptions // = 396
+  case googleProtobufExtensionRangeOptions // = 397
+  case googleProtobufFeatureSet // = 398
+  case googleProtobufFeatureSetDefaults // = 399
+  case googleProtobufField // = 400
+  case googleProtobufFieldDescriptorProto // = 401
+  case googleProtobufFieldMask // = 402
+  case googleProtobufFieldOptions // = 403
+  case googleProtobufFileDescriptorProto // = 404
+  case googleProtobufFileDescriptorSet // = 405
+  case googleProtobufFileOptions // = 406
+  case googleProtobufFloatValue // = 407
+  case googleProtobufGeneratedCodeInfo // = 408
+  case googleProtobufInt32Value // = 409
+  case googleProtobufInt64Value // = 410
+  case googleProtobufListValue // = 411
+  case googleProtobufMessageOptions // = 412
+  case googleProtobufMethod // = 413
+  case googleProtobufMethodDescriptorProto // = 414
+  case googleProtobufMethodOptions // = 415
+  case googleProtobufMixin // = 416
+  case googleProtobufNullValue // = 417
+  case googleProtobufOneofDescriptorProto // = 418
+  case googleProtobufOneofOptions // = 419
+  case googleProtobufOption // = 420
+  case googleProtobufServiceDescriptorProto // = 421
+  case googleProtobufServiceOptions // = 422
+  case googleProtobufSourceCodeInfo // = 423
+  case googleProtobufSourceContext // = 424
+  case googleProtobufStringValue // = 425
+  case googleProtobufStruct // = 426
+  case googleProtobufSymbolVisibility // = 427
+  case googleProtobufSyntax // = 428
+  case googleProtobufTimestamp // = 429
+  case googleProtobufType // = 430
+  case googleProtobufUint32Value // = 431
+  case googleProtobufUint64Value // = 432
+  case googleProtobufUninterpretedOption // = 433
+  case googleProtobufValue // = 434
   case goPackage // = 435
   case gotData // = 436
   case group // = 437
@@ -718,12 +718,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case numberValue // = 689
   case objcClassPrefix // = 690
   case of // = 691
-  case oneOfKind // = 692
-  case oneofDecl // = 693
-  case oneofDescriptorProto // = 694
-  case oneofIndex // = 695
-  case oneofOptions // = 696
-  case oneofs // = 697
+  case oneofDecl // = 692
+  case oneofDescriptorProto // = 693
+  case oneofIndex // = 694
+  case oneofOptions // = 695
+  case oneofs // = 696
+  case oneOfKind // = 697
   case optimizeFor // = 698
   case optimizeMode // = 699
   case option // = 700
@@ -769,33 +769,33 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
   case proto2 // = 740
   case proto3DefaultValue // = 741
   case proto3Optional // = 742
-  case protobufExtensionFieldValues // = 743
-  case protobufFieldNumber // = 744
-  case protobufGeneratedIsEqualTo // = 745
-  case protobufNameMap // = 746
-  case protobufNewField // = 747
-  case protobufPackage // = 748
-  case protobufApiversion2 // = 749
-  case protobufApiversionCheck // = 750
-  case protobufBool // = 751
-  case protobufBytes // = 752
-  case protobufDouble // = 753
-  case protobufEnumMap // = 754
-  case protobufExtension // = 755
-  case protobufFixed32 // = 756
-  case protobufFixed64 // = 757
-  case protobufFloat // = 758
-  case protobufInt32 // = 759
-  case protobufInt64 // = 760
-  case protobufMap // = 761
-  case protobufMessageMap // = 762
-  case protobufSfixed32 // = 763
-  case protobufSfixed64 // = 764
-  case protobufSint32 // = 765
-  case protobufSint64 // = 766
-  case protobufString // = 767
-  case protobufUint32 // = 768
-  case protobufUint64 // = 769
+  case protobufApiversionCheck // = 743
+  case protobufApiversion2 // = 744
+  case protobufBool // = 745
+  case protobufBytes // = 746
+  case protobufDouble // = 747
+  case protobufEnumMap // = 748
+  case protobufExtension // = 749
+  case protobufFixed32 // = 750
+  case protobufFixed64 // = 751
+  case protobufFloat // = 752
+  case protobufInt32 // = 753
+  case protobufInt64 // = 754
+  case protobufMap // = 755
+  case protobufMessageMap // = 756
+  case protobufSfixed32 // = 757
+  case protobufSfixed64 // = 758
+  case protobufSint32 // = 759
+  case protobufSint64 // = 760
+  case protobufString // = 761
+  case protobufUint32 // = 762
+  case protobufUint64 // = 763
+  case protobufExtensionFieldValues // = 764
+  case protobufFieldNumber // = 765
+  case protobufGeneratedIsEqualTo // = 766
+  case protobufNameMap // = 767
+  case protobufNewField // = 768
+  case protobufPackage // = 769
   case `protocol` // = 770
   case protoFieldName // = 771
   case protoMessageName // = 772
@@ -1449,60 +1449,60 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 378: self = .generatedCodeInfo
     case 379: self = .get
     case 380: self = .getExtensionValue
-    case 381: self = .googleProtobufAny
-    case 382: self = .googleProtobufApi
-    case 383: self = .googleProtobufBoolValue
-    case 384: self = .googleProtobufBytesValue
-    case 385: self = .googleProtobufDescriptorProto
-    case 386: self = .googleProtobufDoubleValue
-    case 387: self = .googleProtobufDuration
-    case 388: self = .googleProtobufEdition
-    case 389: self = .googleProtobufEmpty
-    case 390: self = .googleProtobufEnum
-    case 391: self = .googleProtobufEnumDescriptorProto
-    case 392: self = .googleProtobufEnumOptions
-    case 393: self = .googleProtobufEnumValue
-    case 394: self = .googleProtobufEnumValueDescriptorProto
-    case 395: self = .googleProtobufEnumValueOptions
-    case 396: self = .googleProtobufExtensionRangeOptions
-    case 397: self = .googleProtobufFeatureSet
-    case 398: self = .googleProtobufFeatureSetDefaults
-    case 399: self = .googleProtobufField
-    case 400: self = .googleProtobufFieldDescriptorProto
-    case 401: self = .googleProtobufFieldMask
-    case 402: self = .googleProtobufFieldOptions
-    case 403: self = .googleProtobufFileDescriptorProto
-    case 404: self = .googleProtobufFileDescriptorSet
-    case 405: self = .googleProtobufFileOptions
-    case 406: self = .googleProtobufFloatValue
-    case 407: self = .googleProtobufGeneratedCodeInfo
-    case 408: self = .googleProtobufInt32Value
-    case 409: self = .googleProtobufInt64Value
-    case 410: self = .googleProtobufListValue
-    case 411: self = .googleProtobufMessageOptions
-    case 412: self = .googleProtobufMethod
-    case 413: self = .googleProtobufMethodDescriptorProto
-    case 414: self = .googleProtobufMethodOptions
-    case 415: self = .googleProtobufMixin
-    case 416: self = .googleProtobufNullValue
-    case 417: self = .googleProtobufOneofDescriptorProto
-    case 418: self = .googleProtobufOneofOptions
-    case 419: self = .googleProtobufOption
-    case 420: self = .googleProtobufServiceDescriptorProto
-    case 421: self = .googleProtobufServiceOptions
-    case 422: self = .googleProtobufSourceCodeInfo
-    case 423: self = .googleProtobufSourceContext
-    case 424: self = .googleProtobufStringValue
-    case 425: self = .googleProtobufStruct
-    case 426: self = .googleProtobufSymbolVisibility
-    case 427: self = .googleProtobufSyntax
-    case 428: self = .googleProtobufTimestamp
-    case 429: self = .googleProtobufType
-    case 430: self = .googleProtobufUint32Value
-    case 431: self = .googleProtobufUint64Value
-    case 432: self = .googleProtobufUninterpretedOption
-    case 433: self = .googleProtobufValue
-    case 434: self = .googleapis
+    case 381: self = .googleapis
+    case 382: self = .googleProtobufAny
+    case 383: self = .googleProtobufApi
+    case 384: self = .googleProtobufBoolValue
+    case 385: self = .googleProtobufBytesValue
+    case 386: self = .googleProtobufDescriptorProto
+    case 387: self = .googleProtobufDoubleValue
+    case 388: self = .googleProtobufDuration
+    case 389: self = .googleProtobufEdition
+    case 390: self = .googleProtobufEmpty
+    case 391: self = .googleProtobufEnum
+    case 392: self = .googleProtobufEnumDescriptorProto
+    case 393: self = .googleProtobufEnumOptions
+    case 394: self = .googleProtobufEnumValue
+    case 395: self = .googleProtobufEnumValueDescriptorProto
+    case 396: self = .googleProtobufEnumValueOptions
+    case 397: self = .googleProtobufExtensionRangeOptions
+    case 398: self = .googleProtobufFeatureSet
+    case 399: self = .googleProtobufFeatureSetDefaults
+    case 400: self = .googleProtobufField
+    case 401: self = .googleProtobufFieldDescriptorProto
+    case 402: self = .googleProtobufFieldMask
+    case 403: self = .googleProtobufFieldOptions
+    case 404: self = .googleProtobufFileDescriptorProto
+    case 405: self = .googleProtobufFileDescriptorSet
+    case 406: self = .googleProtobufFileOptions
+    case 407: self = .googleProtobufFloatValue
+    case 408: self = .googleProtobufGeneratedCodeInfo
+    case 409: self = .googleProtobufInt32Value
+    case 410: self = .googleProtobufInt64Value
+    case 411: self = .googleProtobufListValue
+    case 412: self = .googleProtobufMessageOptions
+    case 413: self = .googleProtobufMethod
+    case 414: self = .googleProtobufMethodDescriptorProto
+    case 415: self = .googleProtobufMethodOptions
+    case 416: self = .googleProtobufMixin
+    case 417: self = .googleProtobufNullValue
+    case 418: self = .googleProtobufOneofDescriptorProto
+    case 419: self = .googleProtobufOneofOptions
+    case 420: self = .googleProtobufOption
+    case 421: self = .googleProtobufServiceDescriptorProto
+    case 422: self = .googleProtobufServiceOptions
+    case 423: self = .googleProtobufSourceCodeInfo
+    case 424: self = .googleProtobufSourceContext
+    case 425: self = .googleProtobufStringValue
+    case 426: self = .googleProtobufStruct
+    case 427: self = .googleProtobufSymbolVisibility
+    case 428: self = .googleProtobufSyntax
+    case 429: self = .googleProtobufTimestamp
+    case 430: self = .googleProtobufType
+    case 431: self = .googleProtobufUint32Value
+    case 432: self = .googleProtobufUint64Value
+    case 433: self = .googleProtobufUninterpretedOption
+    case 434: self = .googleProtobufValue
     case 435: self = .goPackage
     case 436: self = .gotData
     case 437: self = .group
@@ -1760,12 +1760,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 689: self = .numberValue
     case 690: self = .objcClassPrefix
     case 691: self = .of
-    case 692: self = .oneOfKind
-    case 693: self = .oneofDecl
-    case 694: self = .oneofDescriptorProto
-    case 695: self = .oneofIndex
-    case 696: self = .oneofOptions
-    case 697: self = .oneofs
+    case 692: self = .oneofDecl
+    case 693: self = .oneofDescriptorProto
+    case 694: self = .oneofIndex
+    case 695: self = .oneofOptions
+    case 696: self = .oneofs
+    case 697: self = .oneOfKind
     case 698: self = .optimizeFor
     case 699: self = .optimizeMode
     case 700: self = .option
@@ -1811,33 +1811,33 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case 740: self = .proto2
     case 741: self = .proto3DefaultValue
     case 742: self = .proto3Optional
-    case 743: self = .protobufExtensionFieldValues
-    case 744: self = .protobufFieldNumber
-    case 745: self = .protobufGeneratedIsEqualTo
-    case 746: self = .protobufNameMap
-    case 747: self = .protobufNewField
-    case 748: self = .protobufPackage
-    case 749: self = .protobufApiversion2
-    case 750: self = .protobufApiversionCheck
-    case 751: self = .protobufBool
-    case 752: self = .protobufBytes
-    case 753: self = .protobufDouble
-    case 754: self = .protobufEnumMap
-    case 755: self = .protobufExtension
-    case 756: self = .protobufFixed32
-    case 757: self = .protobufFixed64
-    case 758: self = .protobufFloat
-    case 759: self = .protobufInt32
-    case 760: self = .protobufInt64
-    case 761: self = .protobufMap
-    case 762: self = .protobufMessageMap
-    case 763: self = .protobufSfixed32
-    case 764: self = .protobufSfixed64
-    case 765: self = .protobufSint32
-    case 766: self = .protobufSint64
-    case 767: self = .protobufString
-    case 768: self = .protobufUint32
-    case 769: self = .protobufUint64
+    case 743: self = .protobufApiversionCheck
+    case 744: self = .protobufApiversion2
+    case 745: self = .protobufBool
+    case 746: self = .protobufBytes
+    case 747: self = .protobufDouble
+    case 748: self = .protobufEnumMap
+    case 749: self = .protobufExtension
+    case 750: self = .protobufFixed32
+    case 751: self = .protobufFixed64
+    case 752: self = .protobufFloat
+    case 753: self = .protobufInt32
+    case 754: self = .protobufInt64
+    case 755: self = .protobufMap
+    case 756: self = .protobufMessageMap
+    case 757: self = .protobufSfixed32
+    case 758: self = .protobufSfixed64
+    case 759: self = .protobufSint32
+    case 760: self = .protobufSint64
+    case 761: self = .protobufString
+    case 762: self = .protobufUint32
+    case 763: self = .protobufUint64
+    case 764: self = .protobufExtensionFieldValues
+    case 765: self = .protobufFieldNumber
+    case 766: self = .protobufGeneratedIsEqualTo
+    case 767: self = .protobufNameMap
+    case 768: self = .protobufNewField
+    case 769: self = .protobufPackage
     case 770: self = .protocol
     case 771: self = .protoFieldName
     case 772: self = .protoMessageName
@@ -2489,60 +2489,60 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .generatedCodeInfo: return 378
     case .get: return 379
     case .getExtensionValue: return 380
-    case .googleProtobufAny: return 381
-    case .googleProtobufApi: return 382
-    case .googleProtobufBoolValue: return 383
-    case .googleProtobufBytesValue: return 384
-    case .googleProtobufDescriptorProto: return 385
-    case .googleProtobufDoubleValue: return 386
-    case .googleProtobufDuration: return 387
-    case .googleProtobufEdition: return 388
-    case .googleProtobufEmpty: return 389
-    case .googleProtobufEnum: return 390
-    case .googleProtobufEnumDescriptorProto: return 391
-    case .googleProtobufEnumOptions: return 392
-    case .googleProtobufEnumValue: return 393
-    case .googleProtobufEnumValueDescriptorProto: return 394
-    case .googleProtobufEnumValueOptions: return 395
-    case .googleProtobufExtensionRangeOptions: return 396
-    case .googleProtobufFeatureSet: return 397
-    case .googleProtobufFeatureSetDefaults: return 398
-    case .googleProtobufField: return 399
-    case .googleProtobufFieldDescriptorProto: return 400
-    case .googleProtobufFieldMask: return 401
-    case .googleProtobufFieldOptions: return 402
-    case .googleProtobufFileDescriptorProto: return 403
-    case .googleProtobufFileDescriptorSet: return 404
-    case .googleProtobufFileOptions: return 405
-    case .googleProtobufFloatValue: return 406
-    case .googleProtobufGeneratedCodeInfo: return 407
-    case .googleProtobufInt32Value: return 408
-    case .googleProtobufInt64Value: return 409
-    case .googleProtobufListValue: return 410
-    case .googleProtobufMessageOptions: return 411
-    case .googleProtobufMethod: return 412
-    case .googleProtobufMethodDescriptorProto: return 413
-    case .googleProtobufMethodOptions: return 414
-    case .googleProtobufMixin: return 415
-    case .googleProtobufNullValue: return 416
-    case .googleProtobufOneofDescriptorProto: return 417
-    case .googleProtobufOneofOptions: return 418
-    case .googleProtobufOption: return 419
-    case .googleProtobufServiceDescriptorProto: return 420
-    case .googleProtobufServiceOptions: return 421
-    case .googleProtobufSourceCodeInfo: return 422
-    case .googleProtobufSourceContext: return 423
-    case .googleProtobufStringValue: return 424
-    case .googleProtobufStruct: return 425
-    case .googleProtobufSymbolVisibility: return 426
-    case .googleProtobufSyntax: return 427
-    case .googleProtobufTimestamp: return 428
-    case .googleProtobufType: return 429
-    case .googleProtobufUint32Value: return 430
-    case .googleProtobufUint64Value: return 431
-    case .googleProtobufUninterpretedOption: return 432
-    case .googleProtobufValue: return 433
-    case .googleapis: return 434
+    case .googleapis: return 381
+    case .googleProtobufAny: return 382
+    case .googleProtobufApi: return 383
+    case .googleProtobufBoolValue: return 384
+    case .googleProtobufBytesValue: return 385
+    case .googleProtobufDescriptorProto: return 386
+    case .googleProtobufDoubleValue: return 387
+    case .googleProtobufDuration: return 388
+    case .googleProtobufEdition: return 389
+    case .googleProtobufEmpty: return 390
+    case .googleProtobufEnum: return 391
+    case .googleProtobufEnumDescriptorProto: return 392
+    case .googleProtobufEnumOptions: return 393
+    case .googleProtobufEnumValue: return 394
+    case .googleProtobufEnumValueDescriptorProto: return 395
+    case .googleProtobufEnumValueOptions: return 396
+    case .googleProtobufExtensionRangeOptions: return 397
+    case .googleProtobufFeatureSet: return 398
+    case .googleProtobufFeatureSetDefaults: return 399
+    case .googleProtobufField: return 400
+    case .googleProtobufFieldDescriptorProto: return 401
+    case .googleProtobufFieldMask: return 402
+    case .googleProtobufFieldOptions: return 403
+    case .googleProtobufFileDescriptorProto: return 404
+    case .googleProtobufFileDescriptorSet: return 405
+    case .googleProtobufFileOptions: return 406
+    case .googleProtobufFloatValue: return 407
+    case .googleProtobufGeneratedCodeInfo: return 408
+    case .googleProtobufInt32Value: return 409
+    case .googleProtobufInt64Value: return 410
+    case .googleProtobufListValue: return 411
+    case .googleProtobufMessageOptions: return 412
+    case .googleProtobufMethod: return 413
+    case .googleProtobufMethodDescriptorProto: return 414
+    case .googleProtobufMethodOptions: return 415
+    case .googleProtobufMixin: return 416
+    case .googleProtobufNullValue: return 417
+    case .googleProtobufOneofDescriptorProto: return 418
+    case .googleProtobufOneofOptions: return 419
+    case .googleProtobufOption: return 420
+    case .googleProtobufServiceDescriptorProto: return 421
+    case .googleProtobufServiceOptions: return 422
+    case .googleProtobufSourceCodeInfo: return 423
+    case .googleProtobufSourceContext: return 424
+    case .googleProtobufStringValue: return 425
+    case .googleProtobufStruct: return 426
+    case .googleProtobufSymbolVisibility: return 427
+    case .googleProtobufSyntax: return 428
+    case .googleProtobufTimestamp: return 429
+    case .googleProtobufType: return 430
+    case .googleProtobufUint32Value: return 431
+    case .googleProtobufUint64Value: return 432
+    case .googleProtobufUninterpretedOption: return 433
+    case .googleProtobufValue: return 434
     case .goPackage: return 435
     case .gotData: return 436
     case .group: return 437
@@ -2803,12 +2803,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .numberValue: return 689
     case .objcClassPrefix: return 690
     case .of: return 691
-    case .oneOfKind: return 692
-    case .oneofDecl: return 693
-    case .oneofDescriptorProto: return 694
-    case .oneofIndex: return 695
-    case .oneofOptions: return 696
-    case .oneofs: return 697
+    case .oneofDecl: return 692
+    case .oneofDescriptorProto: return 693
+    case .oneofIndex: return 694
+    case .oneofOptions: return 695
+    case .oneofs: return 696
+    case .oneOfKind: return 697
     case .optimizeFor: return 698
     case .optimizeMode: return 699
     case .option: return 700
@@ -2854,33 +2854,33 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     case .proto2: return 740
     case .proto3DefaultValue: return 741
     case .proto3Optional: return 742
-    case .protobufExtensionFieldValues: return 743
-    case .protobufFieldNumber: return 744
-    case .protobufGeneratedIsEqualTo: return 745
-    case .protobufNameMap: return 746
-    case .protobufNewField: return 747
-    case .protobufPackage: return 748
-    case .protobufApiversion2: return 749
-    case .protobufApiversionCheck: return 750
-    case .protobufBool: return 751
-    case .protobufBytes: return 752
-    case .protobufDouble: return 753
-    case .protobufEnumMap: return 754
-    case .protobufExtension: return 755
-    case .protobufFixed32: return 756
-    case .protobufFixed64: return 757
-    case .protobufFloat: return 758
-    case .protobufInt32: return 759
-    case .protobufInt64: return 760
-    case .protobufMap: return 761
-    case .protobufMessageMap: return 762
-    case .protobufSfixed32: return 763
-    case .protobufSfixed64: return 764
-    case .protobufSint32: return 765
-    case .protobufSint64: return 766
-    case .protobufString: return 767
-    case .protobufUint32: return 768
-    case .protobufUint64: return 769
+    case .protobufApiversionCheck: return 743
+    case .protobufApiversion2: return 744
+    case .protobufBool: return 745
+    case .protobufBytes: return 746
+    case .protobufDouble: return 747
+    case .protobufEnumMap: return 748
+    case .protobufExtension: return 749
+    case .protobufFixed32: return 750
+    case .protobufFixed64: return 751
+    case .protobufFloat: return 752
+    case .protobufInt32: return 753
+    case .protobufInt64: return 754
+    case .protobufMap: return 755
+    case .protobufMessageMap: return 756
+    case .protobufSfixed32: return 757
+    case .protobufSfixed64: return 758
+    case .protobufSint32: return 759
+    case .protobufSint64: return 760
+    case .protobufString: return 761
+    case .protobufUint32: return 762
+    case .protobufUint64: return 763
+    case .protobufExtensionFieldValues: return 764
+    case .protobufFieldNumber: return 765
+    case .protobufGeneratedIsEqualTo: return 766
+    case .protobufNameMap: return 767
+    case .protobufNewField: return 768
+    case .protobufPackage: return 769
     case .protocol: return 770
     case .protoFieldName: return 771
     case .protoMessageName: return 772
@@ -3540,6 +3540,7 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .generatedCodeInfo,
     .get,
     .getExtensionValue,
+    .googleapis,
     .googleProtobufAny,
     .googleProtobufApi,
     .googleProtobufBoolValue,
@@ -3593,7 +3594,6 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .googleProtobufUint64Value,
     .googleProtobufUninterpretedOption,
     .googleProtobufValue,
-    .googleapis,
     .goPackage,
     .gotData,
     .group,
@@ -3851,12 +3851,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .numberValue,
     .objcClassPrefix,
     .of,
-    .oneOfKind,
     .oneofDecl,
     .oneofDescriptorProto,
     .oneofIndex,
     .oneofOptions,
     .oneofs,
+    .oneOfKind,
     .optimizeFor,
     .optimizeMode,
     .option,
@@ -3902,14 +3902,8 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .proto2,
     .proto3DefaultValue,
     .proto3Optional,
-    .protobufExtensionFieldValues,
-    .protobufFieldNumber,
-    .protobufGeneratedIsEqualTo,
-    .protobufNameMap,
-    .protobufNewField,
-    .protobufPackage,
-    .protobufApiversion2,
     .protobufApiversionCheck,
+    .protobufApiversion2,
     .protobufBool,
     .protobufBytes,
     .protobufDouble,
@@ -3929,6 +3923,12 @@ enum SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.Enum,
     .protobufString,
     .protobufUint32,
     .protobufUint64,
+    .protobufExtensionFieldValues,
+    .protobufFieldNumber,
+    .protobufGeneratedIsEqualTo,
+    .protobufNameMap,
+    .protobufNewField,
+    .protobufPackage,
     .protocol,
     .protoFieldName,
     .protoMessageName,
@@ -4210,7 +4210,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     6: .same(proto: "alwaysPrintEnumsAsInts"),
     7: .same(proto: "alwaysPrintInt64sAsNumbers"),
     8: .same(proto: "annotation"),
-    9: .same(proto: "Any"),
+    9: .same(proto: "any"),
     10: .same(proto: "AnyExtensionField"),
     11: .same(proto: "AnyMessageExtension"),
     12: .same(proto: "AnyMessageStorage"),
@@ -4391,7 +4391,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     187: .same(proto: "customCodable"),
     188: .same(proto: "CustomDebugStringConvertible"),
     189: .same(proto: "CustomStringConvertible"),
-    190: .same(proto: "D"),
+    190: .same(proto: "d"),
     191: .same(proto: "Data"),
     192: .same(proto: "dataResult"),
     193: .same(proto: "date"),
@@ -4407,7 +4407,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     203: .same(proto: "decodeJSON"),
     204: .same(proto: "decodeMapField"),
     205: .same(proto: "decodeMessage"),
-    206: .same(proto: "Decoder"),
+    206: .same(proto: "decoder"),
     207: .same(proto: "decodeRepeated"),
     208: .same(proto: "decodeRepeatedBoolField"),
     209: .same(proto: "decodeRepeatedBytesField"),
@@ -4469,7 +4469,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     265: .same(proto: "discardUnknownFields"),
     266: .same(proto: "Double"),
     267: .same(proto: "doubleValue"),
-    268: .same(proto: "Duration"),
+    268: .same(proto: "duration"),
     269: .same(proto: "E"),
     270: .same(proto: "edition"),
     271: .same(proto: "EditionDefault"),
@@ -4582,60 +4582,60 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     378: .same(proto: "GeneratedCodeInfo"),
     379: .same(proto: "get"),
     380: .same(proto: "getExtensionValue"),
-    381: .same(proto: "Google_Protobuf_Any"),
-    382: .same(proto: "Google_Protobuf_Api"),
-    383: .same(proto: "Google_Protobuf_BoolValue"),
-    384: .same(proto: "Google_Protobuf_BytesValue"),
-    385: .same(proto: "Google_Protobuf_DescriptorProto"),
-    386: .same(proto: "Google_Protobuf_DoubleValue"),
-    387: .same(proto: "Google_Protobuf_Duration"),
-    388: .same(proto: "Google_Protobuf_Edition"),
-    389: .same(proto: "Google_Protobuf_Empty"),
-    390: .same(proto: "Google_Protobuf_Enum"),
-    391: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
-    392: .same(proto: "Google_Protobuf_EnumOptions"),
-    393: .same(proto: "Google_Protobuf_EnumValue"),
-    394: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
-    395: .same(proto: "Google_Protobuf_EnumValueOptions"),
-    396: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
-    397: .same(proto: "Google_Protobuf_FeatureSet"),
-    398: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
-    399: .same(proto: "Google_Protobuf_Field"),
-    400: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
-    401: .same(proto: "Google_Protobuf_FieldMask"),
-    402: .same(proto: "Google_Protobuf_FieldOptions"),
-    403: .same(proto: "Google_Protobuf_FileDescriptorProto"),
-    404: .same(proto: "Google_Protobuf_FileDescriptorSet"),
-    405: .same(proto: "Google_Protobuf_FileOptions"),
-    406: .same(proto: "Google_Protobuf_FloatValue"),
-    407: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
-    408: .same(proto: "Google_Protobuf_Int32Value"),
-    409: .same(proto: "Google_Protobuf_Int64Value"),
-    410: .same(proto: "Google_Protobuf_ListValue"),
-    411: .same(proto: "Google_Protobuf_MessageOptions"),
-    412: .same(proto: "Google_Protobuf_Method"),
-    413: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
-    414: .same(proto: "Google_Protobuf_MethodOptions"),
-    415: .same(proto: "Google_Protobuf_Mixin"),
-    416: .same(proto: "Google_Protobuf_NullValue"),
-    417: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
-    418: .same(proto: "Google_Protobuf_OneofOptions"),
-    419: .same(proto: "Google_Protobuf_Option"),
-    420: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
-    421: .same(proto: "Google_Protobuf_ServiceOptions"),
-    422: .same(proto: "Google_Protobuf_SourceCodeInfo"),
-    423: .same(proto: "Google_Protobuf_SourceContext"),
-    424: .same(proto: "Google_Protobuf_StringValue"),
-    425: .same(proto: "Google_Protobuf_Struct"),
-    426: .same(proto: "Google_Protobuf_SymbolVisibility"),
-    427: .same(proto: "Google_Protobuf_Syntax"),
-    428: .same(proto: "Google_Protobuf_Timestamp"),
-    429: .same(proto: "Google_Protobuf_Type"),
-    430: .same(proto: "Google_Protobuf_UInt32Value"),
-    431: .same(proto: "Google_Protobuf_UInt64Value"),
-    432: .same(proto: "Google_Protobuf_UninterpretedOption"),
-    433: .same(proto: "Google_Protobuf_Value"),
-    434: .same(proto: "googleapis"),
+    381: .same(proto: "googleapis"),
+    382: .same(proto: "Google_Protobuf_Any"),
+    383: .same(proto: "Google_Protobuf_Api"),
+    384: .same(proto: "Google_Protobuf_BoolValue"),
+    385: .same(proto: "Google_Protobuf_BytesValue"),
+    386: .same(proto: "Google_Protobuf_DescriptorProto"),
+    387: .same(proto: "Google_Protobuf_DoubleValue"),
+    388: .same(proto: "Google_Protobuf_Duration"),
+    389: .same(proto: "Google_Protobuf_Edition"),
+    390: .same(proto: "Google_Protobuf_Empty"),
+    391: .same(proto: "Google_Protobuf_Enum"),
+    392: .same(proto: "Google_Protobuf_EnumDescriptorProto"),
+    393: .same(proto: "Google_Protobuf_EnumOptions"),
+    394: .same(proto: "Google_Protobuf_EnumValue"),
+    395: .same(proto: "Google_Protobuf_EnumValueDescriptorProto"),
+    396: .same(proto: "Google_Protobuf_EnumValueOptions"),
+    397: .same(proto: "Google_Protobuf_ExtensionRangeOptions"),
+    398: .same(proto: "Google_Protobuf_FeatureSet"),
+    399: .same(proto: "Google_Protobuf_FeatureSetDefaults"),
+    400: .same(proto: "Google_Protobuf_Field"),
+    401: .same(proto: "Google_Protobuf_FieldDescriptorProto"),
+    402: .same(proto: "Google_Protobuf_FieldMask"),
+    403: .same(proto: "Google_Protobuf_FieldOptions"),
+    404: .same(proto: "Google_Protobuf_FileDescriptorProto"),
+    405: .same(proto: "Google_Protobuf_FileDescriptorSet"),
+    406: .same(proto: "Google_Protobuf_FileOptions"),
+    407: .same(proto: "Google_Protobuf_FloatValue"),
+    408: .same(proto: "Google_Protobuf_GeneratedCodeInfo"),
+    409: .same(proto: "Google_Protobuf_Int32Value"),
+    410: .same(proto: "Google_Protobuf_Int64Value"),
+    411: .same(proto: "Google_Protobuf_ListValue"),
+    412: .same(proto: "Google_Protobuf_MessageOptions"),
+    413: .same(proto: "Google_Protobuf_Method"),
+    414: .same(proto: "Google_Protobuf_MethodDescriptorProto"),
+    415: .same(proto: "Google_Protobuf_MethodOptions"),
+    416: .same(proto: "Google_Protobuf_Mixin"),
+    417: .same(proto: "Google_Protobuf_NullValue"),
+    418: .same(proto: "Google_Protobuf_OneofDescriptorProto"),
+    419: .same(proto: "Google_Protobuf_OneofOptions"),
+    420: .same(proto: "Google_Protobuf_Option"),
+    421: .same(proto: "Google_Protobuf_ServiceDescriptorProto"),
+    422: .same(proto: "Google_Protobuf_ServiceOptions"),
+    423: .same(proto: "Google_Protobuf_SourceCodeInfo"),
+    424: .same(proto: "Google_Protobuf_SourceContext"),
+    425: .same(proto: "Google_Protobuf_StringValue"),
+    426: .same(proto: "Google_Protobuf_Struct"),
+    427: .same(proto: "Google_Protobuf_SymbolVisibility"),
+    428: .same(proto: "Google_Protobuf_Syntax"),
+    429: .same(proto: "Google_Protobuf_Timestamp"),
+    430: .same(proto: "Google_Protobuf_Type"),
+    431: .same(proto: "Google_Protobuf_UInt32Value"),
+    432: .same(proto: "Google_Protobuf_UInt64Value"),
+    433: .same(proto: "Google_Protobuf_UninterpretedOption"),
+    434: .same(proto: "Google_Protobuf_Value"),
     435: .same(proto: "goPackage"),
     436: .same(proto: "gotData"),
     437: .same(proto: "group"),
@@ -4893,12 +4893,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     689: .same(proto: "numberValue"),
     690: .same(proto: "objcClassPrefix"),
     691: .same(proto: "of"),
-    692: .same(proto: "OneOf_Kind"),
-    693: .same(proto: "oneofDecl"),
-    694: .same(proto: "OneofDescriptorProto"),
-    695: .same(proto: "oneofIndex"),
-    696: .same(proto: "OneofOptions"),
-    697: .same(proto: "oneofs"),
+    692: .same(proto: "oneofDecl"),
+    693: .same(proto: "OneofDescriptorProto"),
+    694: .same(proto: "oneofIndex"),
+    695: .same(proto: "OneofOptions"),
+    696: .same(proto: "oneofs"),
+    697: .same(proto: "OneOf_Kind"),
     698: .same(proto: "optimizeFor"),
     699: .same(proto: "OptimizeMode"),
     700: .same(proto: "Option"),
@@ -4944,33 +4944,33 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     740: .same(proto: "proto2"),
     741: .same(proto: "proto3DefaultValue"),
     742: .same(proto: "proto3Optional"),
-    743: .same(proto: "protobuf_extensionFieldValues"),
-    744: .same(proto: "protobuf_fieldNumber"),
-    745: .same(proto: "protobuf_generated_isEqualTo"),
-    746: .same(proto: "protobuf_nameMap"),
-    747: .same(proto: "protobuf_newField"),
-    748: .same(proto: "protobuf_package"),
-    749: .same(proto: "ProtobufAPIVersion_2"),
-    750: .same(proto: "ProtobufAPIVersionCheck"),
-    751: .same(proto: "ProtobufBool"),
-    752: .same(proto: "ProtobufBytes"),
-    753: .same(proto: "ProtobufDouble"),
-    754: .same(proto: "ProtobufEnumMap"),
-    755: .same(proto: "protobufExtension"),
-    756: .same(proto: "ProtobufFixed32"),
-    757: .same(proto: "ProtobufFixed64"),
-    758: .same(proto: "ProtobufFloat"),
-    759: .same(proto: "ProtobufInt32"),
-    760: .same(proto: "ProtobufInt64"),
-    761: .same(proto: "ProtobufMap"),
-    762: .same(proto: "ProtobufMessageMap"),
-    763: .same(proto: "ProtobufSFixed32"),
-    764: .same(proto: "ProtobufSFixed64"),
-    765: .same(proto: "ProtobufSInt32"),
-    766: .same(proto: "ProtobufSInt64"),
-    767: .same(proto: "ProtobufString"),
-    768: .same(proto: "ProtobufUInt32"),
-    769: .same(proto: "ProtobufUInt64"),
+    743: .same(proto: "ProtobufAPIVersionCheck"),
+    744: .same(proto: "ProtobufAPIVersion_2"),
+    745: .same(proto: "ProtobufBool"),
+    746: .same(proto: "ProtobufBytes"),
+    747: .same(proto: "ProtobufDouble"),
+    748: .same(proto: "ProtobufEnumMap"),
+    749: .same(proto: "protobufExtension"),
+    750: .same(proto: "ProtobufFixed32"),
+    751: .same(proto: "ProtobufFixed64"),
+    752: .same(proto: "ProtobufFloat"),
+    753: .same(proto: "ProtobufInt32"),
+    754: .same(proto: "ProtobufInt64"),
+    755: .same(proto: "ProtobufMap"),
+    756: .same(proto: "ProtobufMessageMap"),
+    757: .same(proto: "ProtobufSFixed32"),
+    758: .same(proto: "ProtobufSFixed64"),
+    759: .same(proto: "ProtobufSInt32"),
+    760: .same(proto: "ProtobufSInt64"),
+    761: .same(proto: "ProtobufString"),
+    762: .same(proto: "ProtobufUInt32"),
+    763: .same(proto: "ProtobufUInt64"),
+    764: .same(proto: "protobuf_extensionFieldValues"),
+    765: .same(proto: "protobuf_fieldNumber"),
+    766: .same(proto: "protobuf_generated_isEqualTo"),
+    767: .same(proto: "protobuf_nameMap"),
+    768: .same(proto: "protobuf_newField"),
+    769: .same(proto: "protobuf_package"),
     770: .same(proto: "protocol"),
     771: .same(proto: "protoFieldName"),
     772: .same(proto: "protoMessageName"),
@@ -5151,7 +5151,7 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     947: .same(proto: "utf8ToDouble"),
     948: .same(proto: "utf8Validation"),
     949: .same(proto: "UTF8View"),
-    950: .same(proto: "V"),
+    950: .same(proto: "v"),
     951: .same(proto: "value"),
     952: .same(proto: "valueField"),
     953: .same(proto: "values"),
@@ -5159,14 +5159,14 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnum: SwiftProtobuf.
     955: .same(proto: "var"),
     956: .same(proto: "verification"),
     957: .same(proto: "VerificationState"),
-    958: .same(proto: "version"),
+    958: .same(proto: "Version"),
     959: .same(proto: "versionString"),
     960: .same(proto: "visibility"),
     961: .same(proto: "VisibilityFeature"),
     962: .same(proto: "visitExtensionFields"),
     963: .same(proto: "visitExtensionFieldsAsMessageSet"),
     964: .same(proto: "visitMapField"),
-    965: .same(proto: "Visitor"),
+    965: .same(proto: "visitor"),
     966: .same(proto: "visitPacked"),
     967: .same(proto: "visitPackedBoolField"),
     968: .same(proto: "visitPackedDoubleField"),

+ 325 - 325
Tests/SwiftProtobufTests/generated_swift_names_enums.pb.swift

@@ -271,7 +271,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum AnyEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum any: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneAny // = 0
     case UNRECOGNIZED(Int)
@@ -295,7 +295,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.AnyEnum] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.any] = [
       .noneAny,
     ]
 
@@ -5701,7 +5701,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum D: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum d: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneD // = 0
     case UNRECOGNIZED(Int)
@@ -5725,7 +5725,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.D] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.d] = [
       .noneD,
     ]
 
@@ -6181,7 +6181,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Decoder: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum decoder: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneDecoder // = 0
     case UNRECOGNIZED(Int)
@@ -6205,7 +6205,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Decoder] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.decoder] = [
       .noneDecoder,
     ]
 
@@ -8041,7 +8041,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Duration: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum duration: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneDuration // = 0
     case UNRECOGNIZED(Int)
@@ -8065,7 +8065,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration] = [
       .noneDuration,
     ]
 
@@ -11431,6 +11431,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum googleapis: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneGoogleapis // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneGoogleapis
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneGoogleapis
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneGoogleapis: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis] = [
+      .noneGoogleapis,
+    ]
+
+  }
+
   enum Google_Protobuf_Any: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneGoogleProtobufAny // = 0
@@ -13021,36 +13051,6 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum googleapis: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneGoogleapis // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneGoogleapis
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneGoogleapis
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneGoogleapis: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis] = [
-      .noneGoogleapis,
-    ]
-
-  }
-
   enum goPackage: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneGoPackage // = 0
@@ -20761,36 +20761,6 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum OneOf_Kind: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneOneOfKind // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneOneOfKind
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneOneOfKind
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneOneOfKind: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind] = [
-      .noneOneOfKind,
-    ]
-
-  }
-
   enum oneofDecl: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneOneofDecl // = 0
@@ -20941,6 +20911,36 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum OneOf_Kind: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneOneOfKind // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneOneOfKind
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneOneOfKind
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneOneOfKind: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind] = [
+      .noneOneOfKind,
+    ]
+
+  }
+
   enum optimizeFor: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneOptimizeFor // = 0
@@ -22291,182 +22291,32 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum protobuf_extensionFieldValues: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufExtensionFieldValues // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufExtensionFieldValues
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufExtensionFieldValues
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufExtensionFieldValues: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues] = [
-      .noneProtobufExtensionFieldValues,
-    ]
-
-  }
-
-  enum protobuf_fieldNumber: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufFieldNumber // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufFieldNumber
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufFieldNumber
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufFieldNumber: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber] = [
-      .noneProtobufFieldNumber,
-    ]
-
-  }
-
-  enum protobuf_generated_isEqualTo: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufGeneratedIsEqualTo // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufGeneratedIsEqualTo
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufGeneratedIsEqualTo
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufGeneratedIsEqualTo: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo] = [
-      .noneProtobufGeneratedIsEqualTo,
-    ]
-
-  }
-
-  enum protobuf_nameMap: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufNameMap // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufNameMap
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufNameMap
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufNameMap: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap] = [
-      .noneProtobufNameMap,
-    ]
-
-  }
-
-  enum protobuf_newField: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufNewField // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufNewField
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufNewField
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufNewField: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField] = [
-      .noneProtobufNewField,
-    ]
-
-  }
-
-  enum protobuf_package: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum ProtobufAPIVersionCheck: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
-    case noneProtobufPackage // = 0
+    case noneProtobufApiversionCheck // = 0
     case UNRECOGNIZED(Int)
 
     init() {
-      self = .noneProtobufPackage
+      self = .noneProtobufApiversionCheck
     }
 
     init?(rawValue: Int) {
       switch rawValue {
-      case 0: self = .noneProtobufPackage
+      case 0: self = .noneProtobufApiversionCheck
       default: self = .UNRECOGNIZED(rawValue)
       }
     }
 
     var rawValue: Int {
       switch self {
-      case .noneProtobufPackage: return 0
+      case .noneProtobufApiversionCheck: return 0
       case .UNRECOGNIZED(let i): return i
       }
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package] = [
-      .noneProtobufPackage,
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck] = [
+      .noneProtobufApiversionCheck,
     ]
 
   }
@@ -22501,36 +22351,6 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum ProtobufAPIVersionCheck: SwiftProtobuf.Enum, Swift.CaseIterable {
-    typealias RawValue = Int
-    case noneProtobufApiversionCheck // = 0
-    case UNRECOGNIZED(Int)
-
-    init() {
-      self = .noneProtobufApiversionCheck
-    }
-
-    init?(rawValue: Int) {
-      switch rawValue {
-      case 0: self = .noneProtobufApiversionCheck
-      default: self = .UNRECOGNIZED(rawValue)
-      }
-    }
-
-    var rawValue: Int {
-      switch self {
-      case .noneProtobufApiversionCheck: return 0
-      case .UNRECOGNIZED(let i): return i
-      }
-    }
-
-    // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck] = [
-      .noneProtobufApiversionCheck,
-    ]
-
-  }
-
   enum ProtobufBool: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneProtobufBool // = 0
@@ -23101,6 +22921,186 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
+  enum protobuf_extensionFieldValues: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufExtensionFieldValues // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufExtensionFieldValues
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufExtensionFieldValues
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufExtensionFieldValues: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues] = [
+      .noneProtobufExtensionFieldValues,
+    ]
+
+  }
+
+  enum protobuf_fieldNumber: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufFieldNumber // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufFieldNumber
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufFieldNumber
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufFieldNumber: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber] = [
+      .noneProtobufFieldNumber,
+    ]
+
+  }
+
+  enum protobuf_generated_isEqualTo: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufGeneratedIsEqualTo // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufGeneratedIsEqualTo
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufGeneratedIsEqualTo
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufGeneratedIsEqualTo: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo] = [
+      .noneProtobufGeneratedIsEqualTo,
+    ]
+
+  }
+
+  enum protobuf_nameMap: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufNameMap // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufNameMap
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufNameMap
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufNameMap: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap] = [
+      .noneProtobufNameMap,
+    ]
+
+  }
+
+  enum protobuf_newField: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufNewField // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufNewField
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufNewField
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufNewField: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField] = [
+      .noneProtobufNewField,
+    ]
+
+  }
+
+  enum protobuf_package: SwiftProtobuf.Enum, Swift.CaseIterable {
+    typealias RawValue = Int
+    case noneProtobufPackage // = 0
+    case UNRECOGNIZED(Int)
+
+    init() {
+      self = .noneProtobufPackage
+    }
+
+    init?(rawValue: Int) {
+      switch rawValue {
+      case 0: self = .noneProtobufPackage
+      default: self = .UNRECOGNIZED(rawValue)
+      }
+    }
+
+    var rawValue: Int {
+      switch self {
+      case .noneProtobufPackage: return 0
+      case .UNRECOGNIZED(let i): return i
+      }
+    }
+
+    // The compiler won't synthesize support with the UNRECOGNIZED case.
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package] = [
+      .noneProtobufPackage,
+    ]
+
+  }
+
   enum protocolEnum: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneProtocol // = 0
@@ -28501,7 +28501,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum V: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum v: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneV // = 0
     case UNRECOGNIZED(Int)
@@ -28525,7 +28525,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.V] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.v] = [
       .noneV,
     ]
 
@@ -28741,7 +28741,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum version: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum Version: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneVersion // = 0
     case UNRECOGNIZED(Int)
@@ -28765,7 +28765,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.version] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Version] = [
       .noneVersion,
     ]
 
@@ -28951,7 +28951,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
 
   }
 
-  enum Visitor: SwiftProtobuf.Enum, Swift.CaseIterable {
+  enum visitor: SwiftProtobuf.Enum, Swift.CaseIterable {
     typealias RawValue = Int
     case noneVisitor // = 0
     case UNRECOGNIZED(Int)
@@ -28975,7 +28975,7 @@ struct SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums: Sendable {
     }
 
     // The compiler won't synthesize support with the UNRECOGNIZED case.
-    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Visitor] = [
+    static let allCases: [SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.visitor] = [
       .noneVisitor,
     ]
 
@@ -31095,9 +31095,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.annotation: Sw
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.AnyEnum: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.any: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Any"),
+    0: .same(proto: "NONE_any"),
   ]
 }
 
@@ -32181,9 +32181,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.CustomStringCo
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.D: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.d: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_D"),
+    0: .same(proto: "NONE_d"),
   ]
 }
 
@@ -32277,9 +32277,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.decodeMessageE
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Decoder: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.decoder: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Decoder"),
+    0: .same(proto: "NONE_decoder"),
   ]
 }
 
@@ -32649,9 +32649,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.doubleValue: S
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Duration: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.duration: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Duration"),
+    0: .same(proto: "NONE_duration"),
   ]
 }
 
@@ -33327,6 +33327,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.getExtensionVa
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_googleapis"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Google_Protobuf_Any: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_Google_Protobuf_Any"),
@@ -33645,12 +33651,6 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Google_Protobu
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.googleapis: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_googleapis"),
-  ]
-}
-
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.goPackage: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_goPackage"),
@@ -35193,12 +35193,6 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.of: SwiftProto
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_OneOf_Kind"),
-  ]
-}
-
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.oneofDecl: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_oneofDecl"),
@@ -35229,6 +35223,12 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.oneofs: SwiftP
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.OneOf_Kind: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_OneOf_Kind"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.optimizeFor: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_optimizeFor"),
@@ -35499,39 +35499,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.proto3Optional
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_extensionFieldValues"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_fieldNumber"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_generated_isEqualTo"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_nameMap"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_newField"),
-  ]
-}
-
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_protobuf_package"),
+    0: .same(proto: "NONE_ProtobufAPIVersionCheck"),
   ]
 }
 
@@ -35541,12 +35511,6 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVer
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufAPIVersionCheck: SwiftProtobuf._ProtoNameProviding {
-  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_ProtobufAPIVersionCheck"),
-  ]
-}
-
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufBool: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_ProtobufBool"),
@@ -35661,6 +35625,42 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.ProtobufUInt64
   ]
 }
 
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_extensionFieldValues: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_extensionFieldValues"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_fieldNumber: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_fieldNumber"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_generated_isEqualTo: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_generated_isEqualTo"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_nameMap: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_nameMap"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_newField: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_newField"),
+  ]
+}
+
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protobuf_package: SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    0: .same(proto: "NONE_protobuf_package"),
+  ]
+}
+
 extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.protocolEnum: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     0: .same(proto: "NONE_protocol"),
@@ -36741,9 +36741,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.UTF8View: Swif
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.V: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.v: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_V"),
+    0: .same(proto: "NONE_v"),
   ]
 }
 
@@ -36789,9 +36789,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.VerificationSt
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.version: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Version: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_version"),
+    0: .same(proto: "NONE_Version"),
   ]
 }
 
@@ -36831,9 +36831,9 @@ extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.visitMapField:
   ]
 }
 
-extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.Visitor: SwiftProtobuf._ProtoNameProviding {
+extension SwiftProtoTesting_Generated_GeneratedSwiftReservedEnums.visitor: SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
-    0: .same(proto: "NONE_Visitor"),
+    0: .same(proto: "NONE_visitor"),
   ]
 }
 

File diff suppressed because it is too large
+ 346 - 350
Tests/SwiftProtobufTests/generated_swift_names_fields.pb.swift


File diff suppressed because it is too large
+ 173 - 365
Tests/SwiftProtobufTests/generated_swift_names_messages.pb.swift


+ 0 - 4
Tests/SwiftProtobufTests/map_unittest.pb.swift

@@ -279,15 +279,11 @@ extension SwiftProtoTesting_TestMap: SwiftProtobuf.Message, SwiftProtobuf._Messa
     var _mapStringForeignMessage: Dictionary<String,SwiftProtoTesting_ForeignMessage> = [:]
     var _mapInt32AllTypes: Dictionary<Int32,SwiftProtoTesting_TestAllTypes> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Tests/SwiftProtobufTests/test_messages_proto3.pb.swift

@@ -1038,15 +1038,11 @@ extension SwiftProtoTesting_Test3_TestAllTypesProto3: SwiftProtobuf.Message, Swi
     var _fieldName17__: Int32 = 0
     var _fieldName18__: Int32 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1855,15 +1851,11 @@ extension SwiftProtoTesting_Test3_TestAllTypesProto3.NestedMessage: SwiftProtobu
     var _a: Int32 = 0
     var _corecursive: SwiftProtoTesting_Test3_TestAllTypesProto3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 20
Tests/SwiftProtobufTests/unittest.pb.swift

@@ -4075,15 +4075,11 @@ extension SwiftProtoTesting_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._
     var _defaultCord: String? = nil
     var _oneofField: SwiftProtoTesting_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -4760,15 +4756,11 @@ extension SwiftProtoTesting_NestedTestAllTypes: SwiftProtobuf.Message, SwiftProt
     var _lazyChild: SwiftProtoTesting_NestedTestAllTypes? = nil
     var _eagerChild: SwiftProtoTesting_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5088,15 +5080,11 @@ extension SwiftProtoTesting_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._
     var _c: Int32? = nil
     var _optionalForeign: SwiftProtoTesting_ForeignMessage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5550,15 +5538,11 @@ extension SwiftProtoTesting_TestRecursiveMessage: SwiftProtobuf.Message, SwiftPr
     var _a: SwiftProtoTesting_TestRecursiveMessage? = nil
     var _i: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -5790,15 +5774,11 @@ extension SwiftProtoTesting_TestExtremeDefaultValues: SwiftProtobuf.Message, Swi
     var _cordWithZero: String? = nil
     var _replacementString: String? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Tests/SwiftProtobufTests/unittest_proto3.pb.swift

@@ -769,15 +769,11 @@ extension SwiftProtoTesting_Proto3_TestAllTypes: SwiftProtobuf.Message, SwiftPro
     var _repeatedLazyMessage: [SwiftProtoTesting_Proto3_TestAllTypes.NestedMessage] = []
     var _oneofField: SwiftProtoTesting_Proto3_TestAllTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1455,15 +1451,11 @@ extension SwiftProtoTesting_Proto3_NestedTestAllTypes: SwiftProtobuf.Message, Sw
     var _child: SwiftProtoTesting_Proto3_NestedTestAllTypes? = nil
     var _payload: SwiftProtoTesting_Proto3_TestAllTypes? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Tests/SwiftProtobufTests/unittest_proto3_optional.pb.swift

@@ -371,15 +371,11 @@ extension SwiftProtoTesting_TestProto3Optional: SwiftProtobuf.Message, SwiftProt
     var _singularInt32: Int32 = 0
     var _singularInt64: Int64 = 0
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Tests/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift

@@ -783,15 +783,11 @@ extension SwiftProtoTesting_TestAllRequiredTypes: SwiftProtobuf.Message, SwiftPr
     var _defaultCord: String? = nil
     var _oneofField: SwiftProtoTesting_TestAllRequiredTypes.OneOf_OneofField?
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Tests/SwiftProtobufTests/unittest_swift_cycle.pb.swift

@@ -183,15 +183,11 @@ extension SwiftProtoTesting_CycleFoo: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _aBar: SwiftProtoTesting_CycleBar? = nil
     var _aBaz: SwiftProtoTesting_CycleBaz? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -275,15 +271,11 @@ extension SwiftProtoTesting_CycleBar: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _aBaz: SwiftProtoTesting_CycleBaz? = nil
     var _aFoo: SwiftProtoTesting_CycleFoo? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -367,15 +359,11 @@ extension SwiftProtoTesting_CycleBaz: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _aFoo: SwiftProtoTesting_CycleFoo? = nil
     var _aBar: SwiftProtoTesting_CycleBar? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Tests/SwiftProtobufTests/unittest_swift_deprecated.pb.swift

@@ -415,15 +415,11 @@ extension SwiftProtoTesting_Deprecated_MyMsg: SwiftProtobuf.Message, SwiftProtob
     var _fixedField: [UInt32] = []
     var _msgField: SwiftProtoTesting_Deprecated_MyMsg? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -547,15 +543,11 @@ extension SwiftProtoTesting_Deprecated_MyMsg2: SwiftProtobuf.Message, SwiftProto
     var _fixedField: [UInt32] = []
     var _msgField: SwiftProtoTesting_Deprecated_MyMsg2? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Tests/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift

@@ -151,15 +151,11 @@ extension SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage: SwiftProto
     var _message: SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage? = nil
     var _optionalEnum: SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage.Enum? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 4
Tests/SwiftProtobufTests/unittest_swift_extension.pb.swift

@@ -642,15 +642,11 @@ extension SwiftProtoTesting_Extend_MsgUsesStorage: SwiftProtobuf.Message, SwiftP
     var _x: Int32? = nil
     var _y: SwiftProtoTesting_Extend_MsgUsesStorage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 16
Tests/SwiftProtobufTests/unittest_swift_naming.pb.swift

@@ -12428,15 +12428,11 @@ extension SwiftProtoTesting_Names_FieldNames: SwiftProtobuf.Message, SwiftProtob
     var _extension: Int32? = nil
     var _extensions: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -22889,15 +22885,11 @@ extension SwiftProtoTesting_Names_FieldNamingInitials.Lowers: SwiftProtobuf.Mess
     var _theIDNumber: Int32? = nil
     var _requestID: Int32? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -23660,15 +23652,11 @@ extension SwiftProtoTesting_Names_SpecialNames3: SwiftProtobuf.Message, SwiftPro
     var _newValue: SwiftProtoTesting_Names_SpecialNames3.OneOf_NewValue?
     var _forcesStorage: SwiftProtoTesting_Names_SpecialNames3? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -23751,15 +23739,11 @@ extension SwiftProtoTesting_Names_SpecialNames4: SwiftProtobuf.Message, SwiftPro
     var _newValue: String? = nil
     var _forcesStorage: SwiftProtoTesting_Names_SpecialNames4? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Tests/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift

@@ -926,15 +926,11 @@ extension SwiftProtoTesting_Message2: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _mapInt32Enum: Dictionary<Int32,SwiftProtoTesting_Message2.Enum> = [:]
     var _mapInt32Message: Dictionary<Int32,SwiftProtoTesting_Message2> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1699,15 +1695,11 @@ extension SwiftProtoTesting_Msg2UsesStorage: SwiftProtobuf.Message, SwiftProtobu
   fileprivate class _StorageClass {
     var _y: SwiftProtoTesting_Msg2UsesStorage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 8
Tests/SwiftProtobufTests/unittest_swift_runtime_proto3.pb.swift

@@ -751,15 +751,11 @@ extension SwiftProtoTesting_Message3: SwiftProtobuf.Message, SwiftProtobuf._Mess
     var _mapInt32Enum: Dictionary<Int32,SwiftProtoTesting_Message3.Enum> = [:]
     var _mapInt32Message: Dictionary<Int32,SwiftProtoTesting_Message3> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1381,15 +1377,11 @@ extension SwiftProtoTesting_Msg3UsesStorage: SwiftProtobuf.Message, SwiftProtobu
   fileprivate class _StorageClass {
     var _y: SwiftProtoTesting_Msg3UsesStorage? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

+ 0 - 12
Tests/SwiftProtobufTests/unittest_well_known_types.pb.swift

@@ -673,15 +673,11 @@ extension SwiftProtoTesting_TestWellKnownTypes: SwiftProtobuf.Message, SwiftProt
     var _bytesField: SwiftProtobuf.Google_Protobuf_BytesValue? = nil
     var _valueField: SwiftProtobuf.Google_Protobuf_Value? = nil
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -891,15 +887,11 @@ extension SwiftProtoTesting_RepeatedWellKnownTypes: SwiftProtobuf.Message, Swift
     var _stringField: [SwiftProtobuf.Google_Protobuf_StringValue] = []
     var _bytesField: [SwiftProtobuf.Google_Protobuf_BytesValue] = []
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 
@@ -1457,15 +1449,11 @@ extension SwiftProtoTesting_MapWellKnownTypes: SwiftProtobuf.Message, SwiftProto
     var _stringField: Dictionary<Int32,SwiftProtobuf.Google_Protobuf_StringValue> = [:]
     var _bytesField: Dictionary<Int32,SwiftProtobuf.Google_Protobuf_BytesValue> = [:]
 
-    #if swift(>=5.10)
       // This property is used as the initial default value for new instances of the type.
       // The type itself is protecting the reference to its storage via CoW semantics.
       // This will force a copy to be made of this reference when the first mutation occurs;
       // hence, it is safe to mark this as `nonisolated(unsafe)`.
       static nonisolated(unsafe) let defaultInstance = _StorageClass()
-    #else
-      static let defaultInstance = _StorageClass()
-    #endif
 
     private init() {}
 

Some files were not shown because too many files changed in this diff