Skip to content

Commit e9aba0c

Browse files
authored
Remove one more place ctype was used that got missed (#1812)
1 parent 214b052 commit e9aba0c

File tree

3 files changed

+2
-33
lines changed

3 files changed

+2
-33
lines changed

Protos/Tests/SwiftProtobufTests/unittest_mset.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ message TestMessageSetExtension1 {
6262
}
6363
optional int32 i = 15;
6464
optional swift_proto_testing.wire_format.TestMessageSet recursive = 16;
65-
optional string test_aliasing = 17 [ctype = STRING_PIECE];
6665
}
6766

6867
message TestMessageSetExtension2 {

Reference/Tests/SwiftProtobufTests/unittest_mset.pb.swift

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,12 @@ struct SwiftProtoTesting_TestMessageSetExtension1: Sendable {
116116
/// Clears the value of `recursive`. Subsequent reads from it will return its default value.
117117
mutating func clearRecursive() {self._recursive = nil}
118118

119-
var testAliasing: String {
120-
get {return _testAliasing ?? String()}
121-
set {_testAliasing = newValue}
122-
}
123-
/// Returns true if `testAliasing` has been explicitly set.
124-
var hasTestAliasing: Bool {return self._testAliasing != nil}
125-
/// Clears the value of `testAliasing`. Subsequent reads from it will return its default value.
126-
mutating func clearTestAliasing() {self._testAliasing = nil}
127-
128119
var unknownFields = SwiftProtobuf.UnknownStorage()
129120

130121
init() {}
131122

132123
fileprivate var _i: Int32? = nil
133124
fileprivate var _recursive: SwiftProtoTesting_WireFormat_TestMessageSet? = nil
134-
fileprivate var _testAliasing: String? = nil
135125
}
136126

137127
struct SwiftProtoTesting_TestMessageSetExtension2: Sendable {
@@ -449,7 +439,7 @@ extension SwiftProtoTesting_MessageEx: SwiftProtobuf.Message, SwiftProtobuf._Mes
449439

450440
extension SwiftProtoTesting_TestMessageSetExtension1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
451441
static let protoMessageName: String = _protobuf_package + ".TestMessageSetExtension1"
452-
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\u{f}i\0\u{1}recursive\0\u{3}test_aliasing\0")
442+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\u{f}i\0\u{1}recursive\0")
453443

454444
public var isInitialized: Bool {
455445
if let v = self._recursive, !v.isInitialized {return false}
@@ -464,7 +454,6 @@ extension SwiftProtoTesting_TestMessageSetExtension1: SwiftProtobuf.Message, Swi
464454
switch fieldNumber {
465455
case 15: try { try decoder.decodeSingularInt32Field(value: &self._i) }()
466456
case 16: try { try decoder.decodeSingularMessageField(value: &self._recursive) }()
467-
case 17: try { try decoder.decodeSingularStringField(value: &self._testAliasing) }()
468457
default: break
469458
}
470459
}
@@ -481,16 +470,12 @@ extension SwiftProtoTesting_TestMessageSetExtension1: SwiftProtobuf.Message, Swi
481470
try { if let v = self._recursive {
482471
try visitor.visitSingularMessageField(value: v, fieldNumber: 16)
483472
} }()
484-
try { if let v = self._testAliasing {
485-
try visitor.visitSingularStringField(value: v, fieldNumber: 17)
486-
} }()
487473
try unknownFields.traverse(visitor: &visitor)
488474
}
489475

490476
static func ==(lhs: SwiftProtoTesting_TestMessageSetExtension1, rhs: SwiftProtoTesting_TestMessageSetExtension1) -> Bool {
491477
if lhs._i != rhs._i {return false}
492478
if lhs._recursive != rhs._recursive {return false}
493-
if lhs._testAliasing != rhs._testAliasing {return false}
494479
if lhs.unknownFields != rhs.unknownFields {return false}
495480
return true
496481
}

Tests/SwiftProtobufTests/unittest_mset.pb.swift

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,12 @@ struct SwiftProtoTesting_TestMessageSetExtension1: Sendable {
116116
/// Clears the value of `recursive`. Subsequent reads from it will return its default value.
117117
mutating func clearRecursive() {self._recursive = nil}
118118

119-
var testAliasing: String {
120-
get {return _testAliasing ?? String()}
121-
set {_testAliasing = newValue}
122-
}
123-
/// Returns true if `testAliasing` has been explicitly set.
124-
var hasTestAliasing: Bool {return self._testAliasing != nil}
125-
/// Clears the value of `testAliasing`. Subsequent reads from it will return its default value.
126-
mutating func clearTestAliasing() {self._testAliasing = nil}
127-
128119
var unknownFields = SwiftProtobuf.UnknownStorage()
129120

130121
init() {}
131122

132123
fileprivate var _i: Int32? = nil
133124
fileprivate var _recursive: SwiftProtoTesting_WireFormat_TestMessageSet? = nil
134-
fileprivate var _testAliasing: String? = nil
135125
}
136126

137127
struct SwiftProtoTesting_TestMessageSetExtension2: Sendable {
@@ -449,7 +439,7 @@ extension SwiftProtoTesting_MessageEx: SwiftProtobuf.Message, SwiftProtobuf._Mes
449439

450440
extension SwiftProtoTesting_TestMessageSetExtension1: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
451441
static let protoMessageName: String = _protobuf_package + ".TestMessageSetExtension1"
452-
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\u{f}i\0\u{1}recursive\0\u{3}test_aliasing\0")
442+
static let _protobuf_nameMap = SwiftProtobuf._NameMap(bytecode: "\0\u{2}\u{f}i\0\u{1}recursive\0")
453443

454444
public var isInitialized: Bool {
455445
if let v = self._recursive, !v.isInitialized {return false}
@@ -464,7 +454,6 @@ extension SwiftProtoTesting_TestMessageSetExtension1: SwiftProtobuf.Message, Swi
464454
switch fieldNumber {
465455
case 15: try { try decoder.decodeSingularInt32Field(value: &self._i) }()
466456
case 16: try { try decoder.decodeSingularMessageField(value: &self._recursive) }()
467-
case 17: try { try decoder.decodeSingularStringField(value: &self._testAliasing) }()
468457
default: break
469458
}
470459
}
@@ -481,16 +470,12 @@ extension SwiftProtoTesting_TestMessageSetExtension1: SwiftProtobuf.Message, Swi
481470
try { if let v = self._recursive {
482471
try visitor.visitSingularMessageField(value: v, fieldNumber: 16)
483472
} }()
484-
try { if let v = self._testAliasing {
485-
try visitor.visitSingularStringField(value: v, fieldNumber: 17)
486-
} }()
487473
try unknownFields.traverse(visitor: &visitor)
488474
}
489475

490476
static func ==(lhs: SwiftProtoTesting_TestMessageSetExtension1, rhs: SwiftProtoTesting_TestMessageSetExtension1) -> Bool {
491477
if lhs._i != rhs._i {return false}
492478
if lhs._recursive != rhs._recursive {return false}
493-
if lhs._testAliasing != rhs._testAliasing {return false}
494479
if lhs.unknownFields != rhs.unknownFields {return false}
495480
return true
496481
}

0 commit comments

Comments
 (0)