Skip to content

Commit 94f0487

Browse files
authored
Merge pull request apple#1654 from gjcairo/unbreak-removed
Add back removed public API
2 parents df0b3e7 + d09ddd2 commit 94f0487

22 files changed

+13867
-13083
lines changed

Protos/SwiftProtobufTests/generated_swift_names_enum_cases.proto

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

Protos/SwiftProtobufTests/generated_swift_names_enums.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ message GeneratedSwiftReservedEnums {
177177
enum comma { NONE_comma = 0; }
178178
enum consumedBytes { NONE_consumedBytes = 0; }
179179
enum contentsOf { NONE_contentsOf = 0; }
180+
enum ContiguousBytes { NONE_ContiguousBytes = 0; }
180181
enum copy { NONE_copy = 0; }
181182
enum count { NONE_count = 0; }
182183
enum countVarintsInBuffer { NONE_countVarintsInBuffer = 0; }
@@ -276,6 +277,7 @@ message GeneratedSwiftReservedEnums {
276277
enum emitFieldName { NONE_emitFieldName = 0; }
277278
enum emitFieldNumber { NONE_emitFieldNumber = 0; }
278279
enum Empty { NONE_Empty = 0; }
280+
enum emptyData { NONE_emptyData = 0; }
279281
enum encodeAsBytes { NONE_encodeAsBytes = 0; }
280282
enum encoded { NONE_encoded = 0; }
281283
enum encodedJSONString { NONE_encodedJSONString = 0; }
@@ -694,6 +696,7 @@ message GeneratedSwiftReservedEnums {
694696
enum padding { NONE_padding = 0; }
695697
enum parent { NONE_parent = 0; }
696698
enum parse { NONE_parse = 0; }
699+
enum partial { NONE_partial = 0; }
697700
enum path { NONE_path = 0; }
698701
enum paths { NONE_paths = 0; }
699702
enum payload { NONE_payload = 0; }

0 commit comments

Comments
 (0)