Skip to content

Commit 0ee2fba

Browse files
mrabiciumrabiciu
committed
Implicit isUnset for message fields, and move _fields to _MessageImplementationBase
1 parent 23cadb6 commit 0ee2fba

34 files changed

+885
-861
lines changed

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

Lines changed: 213 additions & 213 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
@@ -2726,13 +2726,13 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
27262726
.singularBool({ $0.optionalBool }, fieldNumber: 13, isUnset: { $0._storage._optionalBool == nil }),
27272727
.singularString({ $0.optionalString }, fieldNumber: 14, isUnset: { $0._storage._optionalString == nil }),
27282728
.singularBytes({ $0.optionalBytes }, fieldNumber: 15, isUnset: { $0._storage._optionalBytes == nil }),
2729-
.singularMessage({ $0.optionalNestedMessage }, fieldNumber: 18, isUnset: { $0._storage._optionalNestedMessage == nil }),
2730-
.singularMessage({ $0.optionalForeignMessage }, fieldNumber: 19, isUnset: { $0._storage._optionalForeignMessage == nil }),
2729+
.singularMessage({ $0._storage._optionalNestedMessage }, fieldNumber: 18),
2730+
.singularMessage({ $0._storage._optionalForeignMessage }, fieldNumber: 19),
27312731
.singularEnum({ $0.optionalNestedEnum }, fieldNumber: 21, isUnset: { $0._storage._optionalNestedEnum == nil }),
27322732
.singularEnum({ $0.optionalForeignEnum }, fieldNumber: 22, isUnset: { $0._storage._optionalForeignEnum == nil }),
27332733
.singularString({ $0.optionalStringPiece }, fieldNumber: 24, isUnset: { $0._storage._optionalStringPiece == nil }),
27342734
.singularString({ $0.optionalCord }, fieldNumber: 25, isUnset: { $0._storage._optionalCord == nil }),
2735-
.singularMessage({ $0.recursiveMessage }, fieldNumber: 27, isUnset: { $0._storage._recursiveMessage == nil }),
2735+
.singularMessage({ $0._storage._recursiveMessage }, fieldNumber: 27),
27362736
.repeatedInt32({ $0.repeatedInt32 }, fieldNumber: 31),
27372737
.repeatedInt64({ $0.repeatedInt64 }, fieldNumber: 32),
27382738
.repeatedUInt32({ $0.repeatedUint32 }, fieldNumber: 33),
@@ -2748,31 +2748,31 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
27482748
.repeatedBool({ $0.repeatedBool }, fieldNumber: 43),
27492749
.repeatedString({ $0.repeatedString }, fieldNumber: 44),
27502750
.repeatedBytes({ $0.repeatedBytes }, fieldNumber: 45),
2751-
.repeatedMessage({ $0.repeatedNestedMessage }, fieldNumber: 48),
2752-
.repeatedMessage({ $0.repeatedForeignMessage }, fieldNumber: 49),
2751+
.repeatedMessage({ $0._storage._repeatedNestedMessage }, fieldNumber: 48),
2752+
.repeatedMessage({ $0._storage._repeatedForeignMessage }, fieldNumber: 49),
27532753
.repeatedEnum({ $0.repeatedNestedEnum }, fieldNumber: 51),
27542754
.repeatedEnum({ $0.repeatedForeignEnum }, fieldNumber: 52),
27552755
.repeatedString({ $0.repeatedStringPiece }, fieldNumber: 54),
27562756
.repeatedString({ $0.repeatedCord }, fieldNumber: 55),
2757-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, { $0.mapInt32Int32 }, fieldNumber: 56),
2758-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, { $0.mapInt64Int64 }, fieldNumber: 57),
2759-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, { $0.mapUint32Uint32 }, fieldNumber: 58),
2760-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, { $0.mapUint64Uint64 }, fieldNumber: 59),
2761-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, { $0.mapSint32Sint32 }, fieldNumber: 60),
2762-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, { $0.mapSint64Sint64 }, fieldNumber: 61),
2763-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, { $0.mapFixed32Fixed32 }, fieldNumber: 62),
2764-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, { $0.mapFixed64Fixed64 }, fieldNumber: 63),
2765-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, { $0.mapSfixed32Sfixed32 }, fieldNumber: 64),
2766-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, { $0.mapSfixed64Sfixed64 }, fieldNumber: 65),
2767-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, { $0.mapInt32Float }, fieldNumber: 66),
2768-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, { $0.mapInt32Double }, fieldNumber: 67),
2769-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, { $0.mapBoolBool }, fieldNumber: 68),
2770-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, { $0.mapStringString }, fieldNumber: 69),
2771-
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, { $0.mapStringBytes }, fieldNumber: 70),
2772-
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, { $0.mapStringNestedMessage }, fieldNumber: 71),
2773-
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, { $0.mapStringForeignMessage }, fieldNumber: 72),
2774-
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, { $0.mapStringNestedEnum }, fieldNumber: 73),
2775-
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, { $0.mapStringForeignEnum }, fieldNumber: 74),
2757+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, { $0._storage._mapInt32Int32 }, fieldNumber: 56),
2758+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt64,SwiftProtobuf.ProtobufInt64>.self, { $0._storage._mapInt64Int64 }, fieldNumber: 57),
2759+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt32,SwiftProtobuf.ProtobufUInt32>.self, { $0._storage._mapUint32Uint32 }, fieldNumber: 58),
2760+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufUInt64,SwiftProtobuf.ProtobufUInt64>.self, { $0._storage._mapUint64Uint64 }, fieldNumber: 59),
2761+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt32,SwiftProtobuf.ProtobufSInt32>.self, { $0._storage._mapSint32Sint32 }, fieldNumber: 60),
2762+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSInt64,SwiftProtobuf.ProtobufSInt64>.self, { $0._storage._mapSint64Sint64 }, fieldNumber: 61),
2763+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed32,SwiftProtobuf.ProtobufFixed32>.self, { $0._storage._mapFixed32Fixed32 }, fieldNumber: 62),
2764+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufFixed64,SwiftProtobuf.ProtobufFixed64>.self, { $0._storage._mapFixed64Fixed64 }, fieldNumber: 63),
2765+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, { $0._storage._mapSfixed32Sfixed32 }, fieldNumber: 64),
2766+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed64,SwiftProtobuf.ProtobufSFixed64>.self, { $0._storage._mapSfixed64Sfixed64 }, fieldNumber: 65),
2767+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufFloat>.self, { $0._storage._mapInt32Float }, fieldNumber: 66),
2768+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufDouble>.self, { $0._storage._mapInt32Double }, fieldNumber: 67),
2769+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, { $0._storage._mapBoolBool }, fieldNumber: 68),
2770+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, { $0._storage._mapStringString }, fieldNumber: 69),
2771+
.map(type: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufBytes>.self, { $0._storage._mapStringBytes }, fieldNumber: 70),
2772+
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage>.self, { $0._storage._mapStringNestedMessage }, fieldNumber: 71),
2773+
.map(type: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignMessageProto2>.self, { $0._storage._mapStringForeignMessage }, fieldNumber: 72),
2774+
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum>.self, { $0._storage._mapStringNestedEnum }, fieldNumber: 73),
2775+
.map(type: SwiftProtobuf._ProtobufEnumMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_Proto2_ForeignEnumProto2>.self, { $0._storage._mapStringForeignEnum }, fieldNumber: 74),
27762776
.packedInt32({ $0.packedInt32 }, fieldNumber: 75),
27772777
.packedInt64({ $0.packedInt64 }, fieldNumber: 76),
27782778
.packedUInt32({ $0.packedUint32 }, fieldNumber: 77),
@@ -2824,7 +2824,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
28242824
}
28252825
},
28262826
.extensionFields({ $0._protobuf_extensionFieldValues }, start: 120, end: 201),
2827-
.singularGroup({ $0.data }, fieldNumber: 201, isUnset: { $0._storage._data == nil }),
2827+
.singularGroup({ $0._storage._data }, fieldNumber: 201),
28282828
.singularInt32({ $0.defaultInt32 }, fieldNumber: 241, isUnset: { $0._storage._defaultInt32 == nil }),
28292829
.singularInt64({ $0.defaultInt64 }, fieldNumber: 242, isUnset: { $0._storage._defaultInt64 == nil }),
28302830
.singularUInt32({ $0.defaultUint32 }, fieldNumber: 243, isUnset: { $0._storage._defaultUint32 == nil }),
@@ -2860,7 +2860,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
28602860
.singularInt32({ $0.fieldName18__ }, fieldNumber: 418, isUnset: { $0._storage._fieldName18__ == nil }),
28612861
]
28622862
private static let _oneOfField_oneofUint32: Field<Self> = .singularUInt32({ $0.oneofUint32 }, fieldNumber: 111, isUnset: { _ in false })
2863-
private static let _oneOfField_oneofNestedMessage: Field<Self> = .singularMessage({ $0.oneofNestedMessage }, fieldNumber: 112, isUnset: { _ in false })
2863+
private static let _oneOfField_oneofNestedMessage: Field<Self> = .singularMessage({ $0.oneofNestedMessage }, fieldNumber: 112)
28642864
private static let _oneOfField_oneofString: Field<Self> = .singularString({ $0.oneofString }, fieldNumber: 113, isUnset: { _ in false })
28652865
private static let _oneOfField_oneofBytes: Field<Self> = .singularBytes({ $0.oneofBytes }, fieldNumber: 114, isUnset: { _ in false })
28662866
private static let _oneOfField_oneofBool: Field<Self> = .singularBool({ $0.oneofBool }, fieldNumber: 115, isUnset: { _ in false })
@@ -3072,7 +3072,7 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro
30723072

30733073
static let _fields: [Field<Self>] = [
30743074
.singularInt32({ $0.a }, fieldNumber: 1, isUnset: { $0._storage._a == nil }),
3075-
.singularMessage({ $0.corecursive }, fieldNumber: 2, isUnset: { $0._storage._corecursive == nil }),
3075+
.singularMessage({ $0._storage._corecursive }, fieldNumber: 2),
30763076
]
30773077

30783078

@@ -3272,8 +3272,8 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Messa
32723272
static let _fields: [Field<Self>] = [
32733273
.singularInt32({ $0.optionalInt32 }, fieldNumber: 1001, isUnset: { $0._optionalInt32 == nil }),
32743274
.singularString({ $0.optionalString }, fieldNumber: 1002, isUnset: { $0._optionalString == nil }),
3275-
.singularMessage({ $0.nestedMessage }, fieldNumber: 1003, isUnset: { $0._nestedMessage == nil }),
3276-
.singularGroup({ $0.optionalGroup }, fieldNumber: 1004, isUnset: { $0._optionalGroup == nil }),
3275+
.singularMessage({ $0._nestedMessage }, fieldNumber: 1003),
3276+
.singularGroup({ $0._optionalGroup }, fieldNumber: 1004),
32773277
.singularBool({ $0.optionalBool }, fieldNumber: 1006, isUnset: { $0._optionalBool == nil }),
32783278
.repeatedInt32({ $0.repeatedInt32 }, fieldNumber: 1011),
32793279
]
@@ -3693,16 +3693,16 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.
36933693
.singularBool({ $0.requiredBool }, fieldNumber: 13, isUnset: { $0._storage._requiredBool == nil }),
36943694
.singularString({ $0.requiredString }, fieldNumber: 14, isUnset: { $0._storage._requiredString == nil }),
36953695
.singularBytes({ $0.requiredBytes }, fieldNumber: 15, isUnset: { $0._storage._requiredBytes == nil }),
3696-
.singularMessage({ $0.requiredNestedMessage }, fieldNumber: 18, isUnset: { $0._storage._requiredNestedMessage == nil }),
3697-
.singularMessage({ $0.requiredForeignMessage }, fieldNumber: 19, isUnset: { $0._storage._requiredForeignMessage == nil }),
3696+
.singularMessage({ $0._storage._requiredNestedMessage }, fieldNumber: 18),
3697+
.singularMessage({ $0._storage._requiredForeignMessage }, fieldNumber: 19),
36983698
.singularEnum({ $0.requiredNestedEnum }, fieldNumber: 21, isUnset: { $0._storage._requiredNestedEnum == nil }),
36993699
.singularEnum({ $0.requiredForeignEnum }, fieldNumber: 22, isUnset: { $0._storage._requiredForeignEnum == nil }),
37003700
.singularString({ $0.requiredStringPiece }, fieldNumber: 24, isUnset: { $0._storage._requiredStringPiece == nil }),
37013701
.singularString({ $0.requiredCord }, fieldNumber: 25, isUnset: { $0._storage._requiredCord == nil }),
3702-
.singularMessage({ $0.recursiveMessage }, fieldNumber: 27, isUnset: { $0._storage._recursiveMessage == nil }),
3703-
.singularMessage({ $0.optionalRecursiveMessage }, fieldNumber: 28, isUnset: { $0._storage._optionalRecursiveMessage == nil }),
3702+
.singularMessage({ $0._storage._recursiveMessage }, fieldNumber: 27),
3703+
.singularMessage({ $0._storage._optionalRecursiveMessage }, fieldNumber: 28),
37043704
.extensionFields({ $0._protobuf_extensionFieldValues }, start: 120, end: 201),
3705-
.singularGroup({ $0.data }, fieldNumber: 201, isUnset: { $0._storage._data == nil }),
3705+
.singularGroup({ $0._storage._data }, fieldNumber: 201),
37063706
.singularInt32({ $0.defaultInt32 }, fieldNumber: 241, isUnset: { $0._storage._defaultInt32 == nil }),
37073707
.singularInt64({ $0.defaultInt64 }, fieldNumber: 242, isUnset: { $0._storage._defaultInt64 == nil }),
37083708
.singularUInt32({ $0.defaultUint32 }, fieldNumber: 243, isUnset: { $0._storage._defaultUint32 == nil }),
@@ -3844,8 +3844,8 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedMessage:
38443844

38453845
static let _fields: [Field<Self>] = [
38463846
.singularInt32({ $0.a }, fieldNumber: 1, isUnset: { $0._storage._a == nil }),
3847-
.singularMessage({ $0.corecursive }, fieldNumber: 2, isUnset: { $0._storage._corecursive == nil }),
3848-
.singularMessage({ $0.optionalCorecursive }, fieldNumber: 3, isUnset: { $0._storage._optionalCorecursive == nil }),
3847+
.singularMessage({ $0._storage._corecursive }, fieldNumber: 2),
3848+
.singularMessage({ $0._storage._optionalCorecursive }, fieldNumber: 3),
38493849
]
38503850

38513851

0 commit comments

Comments
 (0)