mirror of
https://github.com/apple/swift-protobuf.git
synced 2026-05-17 10:20:36 +00:00
Update proto files from upstream. (#2045)
Using upstream e82dcf85a5285fa3b172f9d875ec1c3820058cb4.
This commit is contained in:
Thomas Van Lenten
committed by
GitHub
GitHub
parent
81558271e2
commit
175311d9d0
@@ -929,7 +929,11 @@ message EnumValueOptions {
|
||||
|
||||
// Range reserved for first-class extension options defined by the Protobuf
|
||||
// team. Custom options must use the 1000+ range instead.
|
||||
extensions 990 to 998;
|
||||
extensions 990 to 998 [declaration = {
|
||||
number: 998,
|
||||
full_name: ".pb.enumvalue.json",
|
||||
type: ".pb.enumvalue.JsonEnumValueOptions"
|
||||
}];
|
||||
|
||||
// The parser stores options it doesn't recognize here. See above.
|
||||
repeated UninterpretedOption uninterpreted_option = 999;
|
||||
@@ -1168,7 +1172,7 @@ message FeatureSet {
|
||||
},
|
||||
edition_defaults = { edition: EDITION_LEGACY, value: "STYLE_LEGACY" },
|
||||
edition_defaults = { edition: EDITION_2024, value: "STYLE2024" },
|
||||
edition_defaults = { edition: EDITION_UNSTABLE, value: "STYLE2026" }
|
||||
edition_defaults = { edition: EDITION_2026, value: "STYLE2026" }
|
||||
];
|
||||
|
||||
message VisibilityFeature {
|
||||
|
||||
@@ -266,7 +266,7 @@ let ProtobufTestMessages_EditionUnstable_TestMessagesEditionUnstable_Extensions:
|
||||
// constructing a `SimpleExtensionMap`, otherwise, use the above _Extension Properties_
|
||||
// accessors for the extension fields on the messages directly.
|
||||
|
||||
let ProtobufTestMessages_EditionUnstable_Extensions_extension_int32 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufInt32>, ProtobufTestMessages_EditionUnstable_TestAllTypesEditionUnstable>(
|
||||
let ProtobufTestMessages_EditionUnstable_Extensions_extension_int32 = SwiftProtobuf.MessageExtension<SwiftProtobuf.OptionalExtensionField<SwiftProtobuf.ProtobufSFixed32>, ProtobufTestMessages_EditionUnstable_TestAllTypesEditionUnstable>(
|
||||
_protobuf_fieldNumber: 120,
|
||||
fieldName: "protobuf_test_messages.edition_unstable.extension_int32"
|
||||
)
|
||||
@@ -289,7 +289,7 @@ extension ProtobufTestMessages_EditionUnstable_ComplexMessage: SwiftProtobuf.Mes
|
||||
// allocates stack space for every case branch when no optimizations are
|
||||
// enabled. https://github.com/apple/swift-protobuf/issues/1034
|
||||
switch fieldNumber {
|
||||
case 1: try { try decoder.decodeSingularInt32Field(value: &self._d) }()
|
||||
case 1: try { try decoder.decodeSingularSFixed32Field(value: &self._d) }()
|
||||
default: break
|
||||
}
|
||||
}
|
||||
@@ -301,7 +301,7 @@ extension ProtobufTestMessages_EditionUnstable_ComplexMessage: SwiftProtobuf.Mes
|
||||
// are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
|
||||
// https://github.com/apple/swift-protobuf/issues/1182
|
||||
try { if let v = self._d {
|
||||
try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
|
||||
try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 1)
|
||||
} }()
|
||||
try unknownFields.traverse(visitor: &visitor)
|
||||
}
|
||||
@@ -384,14 +384,14 @@ extension ProtobufTestMessages_EditionUnstable_TestAllTypesEditionUnstable: Swif
|
||||
// allocates stack space for every case branch when no optimizations are
|
||||
// enabled. https://github.com/apple/swift-protobuf/issues/1034
|
||||
switch fieldNumber {
|
||||
case 1: try { try decoder.decodeSingularInt32Field(value: &_storage._optionalInt32) }()
|
||||
case 1: try { try decoder.decodeSingularSFixed32Field(value: &_storage._optionalInt32) }()
|
||||
case 2: try { try decoder.decodeSingularMessageField(value: &_storage._optionalForeignMessage) }()
|
||||
case 3: try { try decoder.decodeSingularEnumField(value: &_storage._optionalForeignEnum) }()
|
||||
case 4: try { try decoder.decodeSingularMessageField(value: &_storage._recursiveMessage) }()
|
||||
case 5: try { try decoder.decodeRepeatedInt32Field(value: &_storage._repeatedInt32) }()
|
||||
case 5: try { try decoder.decodeRepeatedSFixed32Field(value: &_storage._repeatedInt32) }()
|
||||
case 6: try { try decoder.decodeRepeatedMessageField(value: &_storage._repeatedForeignMessage) }()
|
||||
case 7: try { try decoder.decodeRepeatedEnumField(value: &_storage._repeatedForeignEnum) }()
|
||||
case 8: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: &_storage._mapInt32Int32) }()
|
||||
case 8: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, value: &_storage._mapInt32Int32) }()
|
||||
case 9: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: &_storage._mapBoolBool) }()
|
||||
case 10: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufString,SwiftProtobuf.ProtobufString>.self, value: &_storage._mapStringString) }()
|
||||
case 11: try { try decoder.decodeMapField(fieldType: SwiftProtobuf._ProtobufMessageMap<SwiftProtobuf.ProtobufString,ProtobufTestMessages_EditionUnstable_ForeignMessageEditionUnstable>.self, value: &_storage._mapStringForeignMessage) }()
|
||||
@@ -414,7 +414,7 @@ extension ProtobufTestMessages_EditionUnstable_TestAllTypesEditionUnstable: Swif
|
||||
// are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
|
||||
// https://github.com/apple/swift-protobuf/issues/1182
|
||||
try { if let v = _storage._optionalInt32 {
|
||||
try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
|
||||
try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 1)
|
||||
} }()
|
||||
try { if let v = _storage._optionalForeignMessage {
|
||||
try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
|
||||
@@ -426,7 +426,7 @@ extension ProtobufTestMessages_EditionUnstable_TestAllTypesEditionUnstable: Swif
|
||||
try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
|
||||
} }()
|
||||
if !_storage._repeatedInt32.isEmpty {
|
||||
try visitor.visitPackedInt32Field(value: _storage._repeatedInt32, fieldNumber: 5)
|
||||
try visitor.visitPackedSFixed32Field(value: _storage._repeatedInt32, fieldNumber: 5)
|
||||
}
|
||||
if !_storage._repeatedForeignMessage.isEmpty {
|
||||
try visitor.visitRepeatedMessageField(value: _storage._repeatedForeignMessage, fieldNumber: 6)
|
||||
@@ -435,7 +435,7 @@ extension ProtobufTestMessages_EditionUnstable_TestAllTypesEditionUnstable: Swif
|
||||
try visitor.visitPackedEnumField(value: _storage._repeatedForeignEnum, fieldNumber: 7)
|
||||
}
|
||||
if !_storage._mapInt32Int32.isEmpty {
|
||||
try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufInt32,SwiftProtobuf.ProtobufInt32>.self, value: _storage._mapInt32Int32, fieldNumber: 8)
|
||||
try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufSFixed32,SwiftProtobuf.ProtobufSFixed32>.self, value: _storage._mapInt32Int32, fieldNumber: 8)
|
||||
}
|
||||
if !_storage._mapBoolBool.isEmpty {
|
||||
try visitor.visitMapField(fieldType: SwiftProtobuf._ProtobufMap<SwiftProtobuf.ProtobufBool,SwiftProtobuf.ProtobufBool>.self, value: _storage._mapBoolBool, fieldNumber: 9)
|
||||
@@ -503,7 +503,7 @@ extension ProtobufTestMessages_EditionUnstable_ForeignMessageEditionUnstable: Sw
|
||||
// allocates stack space for every case branch when no optimizations are
|
||||
// enabled. https://github.com/apple/swift-protobuf/issues/1034
|
||||
switch fieldNumber {
|
||||
case 1: try { try decoder.decodeSingularInt32Field(value: &self._c) }()
|
||||
case 1: try { try decoder.decodeSingularSFixed32Field(value: &self._c) }()
|
||||
default: break
|
||||
}
|
||||
}
|
||||
@@ -515,7 +515,7 @@ extension ProtobufTestMessages_EditionUnstable_ForeignMessageEditionUnstable: Sw
|
||||
// are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
|
||||
// https://github.com/apple/swift-protobuf/issues/1182
|
||||
try { if let v = self._c {
|
||||
try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
|
||||
try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 1)
|
||||
} }()
|
||||
try unknownFields.traverse(visitor: &visitor)
|
||||
}
|
||||
|
||||
@@ -10,7 +10,5 @@ let bundledFeatureSetDefaultBytes: [UInt8] = [
|
||||
0x01, 0x18, 0x01, 0x20, 0x02, 0x28, 0x01, 0x30, 0x01, 0x2a, 0x04, 0x38,
|
||||
0x02, 0x40, 0x01, 0x0a, 0x17, 0x18, 0xe9, 0x07, 0x22, 0x10, 0x08, 0x01,
|
||||
0x10, 0x01, 0x18, 0x01, 0x20, 0x02, 0x28, 0x01, 0x30, 0x01, 0x38, 0x01,
|
||||
0x40, 0x02, 0x2a, 0x00, 0x0a, 0x17, 0x18, 0x8f, 0x4e, 0x22, 0x10, 0x08,
|
||||
0x01, 0x10, 0x01, 0x18, 0x01, 0x20, 0x02, 0x28, 0x01, 0x30, 0x01, 0x40,
|
||||
0x02, 0x38, 0x03, 0x2a, 0x00, 0x20, 0xe6, 0x07, 0x28, 0xe9, 0x07
|
||||
0x40, 0x02, 0x2a, 0x00, 0x20, 0xe6, 0x07, 0x28, 0xe9, 0x07
|
||||
]
|
||||
|
||||
@@ -16,9 +16,5 @@ let testFeatureSetDefaultBytes: [UInt8] = [
|
||||
0xe9, 0x07, 0x22, 0x1e, 0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20, 0x02,
|
||||
0x28, 0x01, 0x30, 0x01, 0x38, 0x01, 0x40, 0x02, 0xfa, 0xf0, 0x04, 0x0a,
|
||||
0x08, 0x01, 0x10, 0x01, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x2a, 0x04,
|
||||
0xfa, 0xf0, 0x04, 0x00, 0x0a, 0x29, 0x18, 0x8f, 0x4e, 0x22, 0x1e, 0x08,
|
||||
0x01, 0x10, 0x01, 0x18, 0x01, 0x20, 0x02, 0x28, 0x01, 0x30, 0x01, 0x40,
|
||||
0x02, 0x38, 0x03, 0xfa, 0xf0, 0x04, 0x0a, 0x08, 0x01, 0x10, 0x01, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x01, 0x2a, 0x04, 0xfa, 0xf0, 0x04, 0x00, 0x20,
|
||||
0xe6, 0x07, 0x28, 0xe9, 0x07
|
||||
0xfa, 0xf0, 0x04, 0x00, 0x20, 0xe6, 0x07, 0x28, 0xe9, 0x07
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user