Skip to content

Commit 07aec96

Browse files
mrabiciumrabiciu
committed
Implicit isUnset for message fields, and move _fields to _MessageImplementationBase
1 parent 1c5a664 commit 07aec96

39 files changed

+14805
-15152
lines changed

‎FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift‎

Lines changed: 213 additions & 213 deletions
Large diffs are not rendered by default.

‎Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto‎

Lines changed: 741 additions & 683 deletions
Large diffs are not rendered by default.

‎Protos/SwiftProtobufTests/generated_swift_names_fields.proto‎

Lines changed: 741 additions & 683 deletions
Large diffs are not rendered by default.

‎Sources/Conformance/conformance.pb.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ extension Conformance_ConformanceRequest: SwiftProtobuf.Message, SwiftProtobuf._
543543
.singularEnum({ $0.requestedOutputFormat }, fieldNumber: 3, defaultValue: .unspecified),
544544
.singularString({ $0.messageType }, fieldNumber: 4),
545545
.singularEnum({ $0.testCategory }, fieldNumber: 5, defaultValue: .unspecifiedTest),
546-
.singularMessage({ $0.jspbEncodingOptions }, fieldNumber: 6, isUnset: { $0._jspbEncodingOptions == nil }),
546+
.singularMessage({ $0._jspbEncodingOptions }, fieldNumber: 6),
547547
.oneOf({ $0.payload }) {
548548
switch $0 {
549549
case .jspbPayload:

‎Sources/Conformance/test_messages_proto2.pb.swift‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,13 +2749,13 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
27492749
.singularBool({ $0.optionalBool }, fieldNumber: 13, isUnset: { $0._storage._optionalBool == nil }),
27502750
.singularString({ $0.optionalString }, fieldNumber: 14, isUnset: { $0._storage._optionalString == nil }),
27512751
.singularBytes({ $0.optionalBytes }, fieldNumber: 15, isUnset: { $0._storage._optionalBytes == nil }),
2752-
.singularMessage({ $0.optionalNestedMessage }, fieldNumber: 18, isUnset: { $0._storage._optionalNestedMessage == nil }),
2753-
.singularMessage({ $0.optionalForeignMessage }, fieldNumber: 19, isUnset: { $0._storage._optionalForeignMessage == nil }),
2752+
.singularMessage({ $0._storage._optionalNestedMessage }, fieldNumber: 18),
2753+
.singularMessage({ $0._storage._optionalForeignMessage }, fieldNumber: 19),
27542754
.singularEnum({ $0.optionalNestedEnum }, fieldNumber: 21, isUnset: { $0._storage._optionalNestedEnum == nil }),
27552755
.singularEnum({ $0.optionalForeignEnum }, fieldNumber: 22, isUnset: { $0._storage._optionalForeignEnum == nil }),
27562756
.singularString({ $0.optionalStringPiece }, fieldNumber: 24, isUnset: { $0._storage._optionalStringPiece == nil }),
27572757
.singularString({ $0.optionalCord }, fieldNumber: 25, isUnset: { $0._storage._optionalCord == nil }),
2758-
.singularMessage({ $0.recursiveMessage }, fieldNumber: 27, isUnset: { $0._storage._recursiveMessage == nil }),
2758+
.singularMessage({ $0._storage._recursiveMessage }, fieldNumber: 27),
27592759
.repeatedInt32({ $0.repeatedInt32 }, fieldNumber: 31),
27602760
.repeatedInt64({ $0.repeatedInt64 }, fieldNumber: 32),
27612761
.repeatedUInt32({ $0.repeatedUint32 }, fieldNumber: 33),
@@ -2771,31 +2771,31 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
27712771
.repeatedBool({ $0.repeatedBool }, fieldNumber: 43),
27722772
.repeatedString({ $0.repeatedString }, fieldNumber: 44),
27732773
.repeatedBytes({ $0.repeatedBytes }, fieldNumber: 45),
2774-
.repeatedMessage({ $0.repeatedNestedMessage }, fieldNumber: 48),
2775-
.repeatedMessage({ $0.repeatedForeignMessage }, fieldNumber: 49),
2774+
.repeatedMessage({ $0._storage._repeatedNestedMessage }, fieldNumber: 48),
2775+
.repeatedMessage({ $0._storage._repeatedForeignMessage }, fieldNumber: 49),
27762776
.repeatedEnum({ $0.repeatedNestedEnum }, fieldNumber: 51),
27772777
.repeatedEnum({ $0.repeatedForeignEnum }, fieldNumber: 52),
27782778
.repeatedString({ $0.repeatedStringPiece }, fieldNumber: 54),
27792779
.repeatedString({ $0.repeatedCord }, fieldNumber: 55),
2780-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, { $0.mapInt32Int32 }, fieldNumber: 56),
2781-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, { $0.mapInt64Int64 }, fieldNumber: 57),
2782-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, { $0.mapUint32Uint32 }, fieldNumber: 58),
2783-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, { $0.mapUint64Uint64 }, fieldNumber: 59),
2784-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, { $0.mapSint32Sint32 }, fieldNumber: 60),
2785-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, { $0.mapSint64Sint64 }, fieldNumber: 61),
2786-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, { $0.mapFixed32Fixed32 }, fieldNumber: 62),
2787-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, { $0.mapFixed64Fixed64 }, fieldNumber: 63),
2788-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, { $0.mapSfixed32Sfixed32 }, fieldNumber: 64),
2789-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, { $0.mapSfixed64Sfixed64 }, fieldNumber: 65),
2790-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, { $0.mapInt32Float }, fieldNumber: 66),
2791-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, { $0.mapInt32Double }, fieldNumber: 67),
2792-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, { $0.mapBoolBool }, fieldNumber: 68),
2793-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, { $0.mapStringString }, fieldNumber: 69),
2794-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, { $0.mapStringBytes }, fieldNumber: 70),
2795-
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, { $0.mapStringNestedMessage }, fieldNumber: 71),
2796-
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, { $0.mapStringForeignMessage }, fieldNumber: 72),
2797-
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, { $0.mapStringNestedEnum }, fieldNumber: 73),
2798-
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, { $0.mapStringForeignEnum }, fieldNumber: 74),
2780+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, { $0._storage._mapInt32Int32 }, fieldNumber: 56),
2781+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, { $0._storage._mapInt64Int64 }, fieldNumber: 57),
2782+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, { $0._storage._mapUint32Uint32 }, fieldNumber: 58),
2783+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, { $0._storage._mapUint64Uint64 }, fieldNumber: 59),
2784+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, { $0._storage._mapSint32Sint32 }, fieldNumber: 60),
2785+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, { $0._storage._mapSint64Sint64 }, fieldNumber: 61),
2786+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, { $0._storage._mapFixed32Fixed32 }, fieldNumber: 62),
2787+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, { $0._storage._mapFixed64Fixed64 }, fieldNumber: 63),
2788+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, { $0._storage._mapSfixed32Sfixed32 }, fieldNumber: 64),
2789+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, { $0._storage._mapSfixed64Sfixed64 }, fieldNumber: 65),
2790+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, { $0._storage._mapInt32Float }, fieldNumber: 66),
2791+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, { $0._storage._mapInt32Double }, fieldNumber: 67),
2792+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, { $0._storage._mapBoolBool }, fieldNumber: 68),
2793+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, { $0._storage._mapStringString }, fieldNumber: 69),
2794+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, { $0._storage._mapStringBytes }, fieldNumber: 70),
2795+
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, { $0._storage._mapStringNestedMessage }, fieldNumber: 71),
2796+
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, { $0._storage._mapStringForeignMessage }, fieldNumber: 72),
2797+
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, { $0._storage._mapStringNestedEnum }, fieldNumber: 73),
2798+
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, { $0._storage._mapStringForeignEnum }, fieldNumber: 74),
27992799
.packedInt32({ $0.packedInt32 }, fieldNumber: 75),
28002800
.packedInt64({ $0.packedInt64 }, fieldNumber: 76),
28012801
.packedUInt32({ $0.packedUint32 }, fieldNumber: 77),
@@ -2847,7 +2847,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
28472847
}
28482848
},
28492849
.extensionFields({ $0._protobuf_extensionFieldValues }, start: 120, end: 201),
2850-
.singularGroup({ $0.data }, fieldNumber: 201, isUnset: { $0._storage._data == nil }),
2850+
.singularGroup({ $0._storage._data }, fieldNumber: 201),
28512851
.singularInt32({ $0.defaultInt32 }, fieldNumber: 241, isUnset: { $0._storage._defaultInt32 == nil }),
28522852
.singularInt64({ $0.defaultInt64 }, fieldNumber: 242, isUnset: { $0._storage._defaultInt64 == nil }),
28532853
.singularUInt32({ $0.defaultUint32 }, fieldNumber: 243, isUnset: { $0._storage._defaultUint32 == nil }),
@@ -2883,7 +2883,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
28832883
.singularInt32({ $0.fieldName18__ }, fieldNumber: 418, isUnset: { $0._storage._fieldName18__ == nil }),
28842884
]
28852885
private static let _oneOfField_oneofUint32: Field<Self> = .singularUInt32({ $0.oneofUint32 }, fieldNumber: 111, isUnset: { _ in false })
2886-
private static let _oneOfField_oneofNestedMessage: Field<Self> = .singularMessage({ $0.oneofNestedMessage }, fieldNumber: 112, isUnset: { _ in false })
2886+
private static let _oneOfField_oneofNestedMessage: Field<Self> = .singularMessage({ $0.oneofNestedMessage }, fieldNumber: 112)
28872887
private static let _oneOfField_oneofString: Field<Self> = .singularString({ $0.oneofString }, fieldNumber: 113, isUnset: { _ in false })
28882888
private static let _oneOfField_oneofBytes: Field<Self> = .singularBytes({ $0.oneofBytes }, fieldNumber: 114, isUnset: { _ in false })
28892889
private static let _oneOfField_oneofBool: Field<Self> = .singularBool({ $0.oneofBool }, fieldNumber: 115, isUnset: { _ in false })
@@ -3095,7 +3095,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
30953095

30963096
static let _fields: [Field<Self>] = [
30973097
.singularInt32({ $0.a }, fieldNumber: 1, isUnset: { $0._storage._a == nil }),
3098-
.singularMessage({ $0.corecursive }, fieldNumber: 2, isUnset: { $0._storage._corecursive == nil }),
3098+
.singularMessage({ $0._storage._corecursive }, fieldNumber: 2),
30993099
]
31003100

31013101

@@ -3295,8 +3295,8 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Messa
32953295
static let _fields: [Field<Self>] = [
32963296
.singularInt32({ $0.optionalInt32 }, fieldNumber: 1001, isUnset: { $0._optionalInt32 == nil }),
32973297
.singularString({ $0.optionalString }, fieldNumber: 1002, isUnset: { $0._optionalString == nil }),
3298-
.singularMessage({ $0.nestedMessage }, fieldNumber: 1003, isUnset: { $0._nestedMessage == nil }),
3299-
.singularGroup({ $0.optionalGroup }, fieldNumber: 1004, isUnset: { $0._optionalGroup == nil }),
3298+
.singularMessage({ $0._nestedMessage }, fieldNumber: 1003),
3299+
.singularGroup({ $0._optionalGroup }, fieldNumber: 1004),
33003300
.singularBool({ $0.optionalBool }, fieldNumber: 1006, isUnset: { $0._optionalBool == nil }),
33013301
.repeatedInt32({ $0.repeatedInt32 }, fieldNumber: 1011),
33023302
]
@@ -3716,16 +3716,16 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.
37163716
.singularBool({ $0.requiredBool }, fieldNumber: 13, isUnset: { $0._storage._requiredBool == nil }),
37173717
.singularString({ $0.requiredString }, fieldNumber: 14, isUnset: { $0._storage._requiredString == nil }),
37183718
.singularBytes({ $0.requiredBytes }, fieldNumber: 15, isUnset: { $0._storage._requiredBytes == nil }),
3719-
.singularMessage({ $0.requiredNestedMessage }, fieldNumber: 18, isUnset: { $0._storage._requiredNestedMessage == nil }),
3720-
.singularMessage({ $0.requiredForeignMessage }, fieldNumber: 19, isUnset: { $0._storage._requiredForeignMessage == nil }),
3719+
.singularMessage({ $0._storage._requiredNestedMessage }, fieldNumber: 18),
3720+
.singularMessage({ $0._storage._requiredForeignMessage }, fieldNumber: 19),
37213721
.singularEnum({ $0.requiredNestedEnum }, fieldNumber: 21, isUnset: { $0._storage._requiredNestedEnum == nil }),
37223722
.singularEnum({ $0.requiredForeignEnum }, fieldNumber: 22, isUnset: { $0._storage._requiredForeignEnum == nil }),
37233723
.singularString({ $0.requiredStringPiece }, fieldNumber: 24, isUnset: { $0._storage._requiredStringPiece == nil }),
37243724
.singularString({ $0.requiredCord }, fieldNumber: 25, isUnset: { $0._storage._requiredCord == nil }),
3725-
.singularMessage({ $0.recursiveMessage }, fieldNumber: 27, isUnset: { $0._storage._recursiveMessage == nil }),
3726-
.singularMessage({ $0.optionalRecursiveMessage }, fieldNumber: 28, isUnset: { $0._storage._optionalRecursiveMessage == nil }),
3725+
.singularMessage({ $0._storage._recursiveMessage }, fieldNumber: 27),
3726+
.singularMessage({ $0._storage._optionalRecursiveMessage }, fieldNumber: 28),
37273727
.extensionFields({ $0._protobuf_extensionFieldValues }, start: 120, end: 201),
3728-
.singularGroup({ $0.data }, fieldNumber: 201, isUnset: { $0._storage._data == nil }),
3728+
.singularGroup({ $0._storage._data }, fieldNumber: 201),
37293729
.singularInt32({ $0.defaultInt32 }, fieldNumber: 241, isUnset: { $0._storage._defaultInt32 == nil }),
37303730
.singularInt64({ $0.defaultInt64 }, fieldNumber: 242, isUnset: { $0._storage._defaultInt64 == nil }),
37313731
.singularUInt32({ $0.defaultUint32 }, fieldNumber: 243, isUnset: { $0._storage._defaultUint32 == nil }),
@@ -3867,8 +3867,8 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedMessage:
38673867

38683868
static let _fields: [Field<Self>] = [
38693869
.singularInt32({ $0.a }, fieldNumber: 1, isUnset: { $0._storage._a == nil }),
3870-
.singularMessage({ $0.corecursive }, fieldNumber: 2, isUnset: { $0._storage._corecursive == nil }),
3871-
.singularMessage({ $0.optionalCorecursive }, fieldNumber: 3, isUnset: { $0._storage._optionalCorecursive == nil }),
3870+
.singularMessage({ $0._storage._corecursive }, fieldNumber: 2),
3871+
.singularMessage({ $0._storage._optionalCorecursive }, fieldNumber: 3),
38723872
]
38733873

38743874

0 commit comments

Comments
 (0)