Skip to content

Commit f4d8b01

Browse files
rgoldfinger6rgoldfinger6
authored
Merge pull request #24699 from protocolbuffers/edition_unstable_33.x
Add EDITION_UNSTABLE for new edition development
2 parents 93a4005 + e9f62c6 commit f4d8b01

File tree

15 files changed

+87
-61
lines changed

15 files changed

+87
-61
lines changed

‎csharp/src/Google.Protobuf.Test/testprotos.pb‎

143 Bytes
Binary file not shown.

‎csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -255,18 +255,19 @@ static DescriptorReflection() {
255255
"AiABKAkSDQoFYmVnaW4YAyABKAUSCwoDZW5kGAQgASgFEkgKCHNlbWFudGlj",
256256
"GAUgASgOMjYuZ29vZ2xlLnByb3RvYnVmLkdlbmVyYXRlZENvZGVJbmZvLkFu",
257257
"bm90YXRpb24uU2VtYW50aWMiKAoIU2VtYW50aWMSCAoETk9ORRAAEgcKA1NF",
258-
"VBABEgkKBUFMSUFTEAIqpwIKB0VkaXRpb24SEwoPRURJVElPTl9VTktOT1dO",
258+
"VBABEgkKBUFMSUFTEAIqvgIKB0VkaXRpb24SEwoPRURJVElPTl9VTktOT1dO",
259259
"EAASEwoORURJVElPTl9MRUdBQ1kQhAcSEwoORURJVElPTl9QUk9UTzIQ5gcS",
260260
"EwoORURJVElPTl9QUk9UTzMQ5wcSEQoMRURJVElPTl8yMDIzEOgHEhEKDEVE",
261-
"SVRJT05fMjAyNBDpBxIXChNFRElUSU9OXzFfVEVTVF9PTkxZEAESFwoTRURJ",
262-
"VElPTl8yX1RFU1RfT05MWRACEh0KF0VESVRJT05fOTk5OTdfVEVTVF9PTkxZ",
263-
"EJ2NBhIdChdFRElUSU9OXzk5OTk4X1RFU1RfT05MWRCejQYSHQoXRURJVElP",
264-
"Tl85OTk5OV9URVNUX09OTFkQn40GEhMKC0VESVRJT05fTUFYEP////8HKlUK",
265-
"EFN5bWJvbFZpc2liaWxpdHkSFAoQVklTSUJJTElUWV9VTlNFVBAAEhQKEFZJ",
266-
"U0lCSUxJVFlfTE9DQUwQARIVChFWSVNJQklMSVRZX0VYUE9SVBACQn4KE2Nv",
267-
"bS5nb29nbGUucHJvdG9idWZCEERlc2NyaXB0b3JQcm90b3NIAVotZ29vZ2xl",
268-
"LmdvbGFuZy5vcmcvcHJvdG9idWYvdHlwZXMvZGVzY3JpcHRvcnBi+AEBogID",
269-
"R1BCqgIaR29vZ2xlLlByb3RvYnVmLlJlZmxlY3Rpb24="));
261+
"SVRJT05fMjAyNBDpBxIVChBFRElUSU9OX1VOU1RBQkxFEI9OEhcKE0VESVRJ",
262+
"T05fMV9URVNUX09OTFkQARIXChNFRElUSU9OXzJfVEVTVF9PTkxZEAISHQoX",
263+
"RURJVElPTl85OTk5N19URVNUX09OTFkQnY0GEh0KF0VESVRJT05fOTk5OThf",
264+
"VEVTVF9PTkxZEJ6NBhIdChdFRElUSU9OXzk5OTk5X1RFU1RfT05MWRCfjQYS",
265+
"EwoLRURJVElPTl9NQVgQ/////wcqVQoQU3ltYm9sVmlzaWJpbGl0eRIUChBW",
266+
"SVNJQklMSVRZX1VOU0VUEAASFAoQVklTSUJJTElUWV9MT0NBTBABEhUKEVZJ",
267+
"U0lCSUxJVFlfRVhQT1JUEAJCfgoTY29tLmdvb2dsZS5wcm90b2J1ZkIQRGVz",
268+
"Y3JpcHRvclByb3Rvc0gBWi1nb29nbGUuZ29sYW5nLm9yZy9wcm90b2J1Zi90",
269+
"eXBlcy9kZXNjcmlwdG9ycGL4AQGiAgNHUEKqAhpHb29nbGUuUHJvdG9idWYu",
270+
"UmVmbGVjdGlvbg=="));
270271
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
271272
new pbr::FileDescriptor[] { },
272273
new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.Reflection.Edition), typeof(global::Google.Protobuf.Reflection.SymbolVisibility), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -330,6 +331,10 @@ public enum Edition {
330331
[pbr::OriginalName("EDITION_2023")] _2023 = 1000,
331332
[pbr::OriginalName("EDITION_2024")] _2024 = 1001,
332333
/// <summary>
334+
/// A placeholder edition for developing and testing unscheduled features.
335+
/// </summary>
336+
[pbr::OriginalName("EDITION_UNSTABLE")] Unstable = 9999,
337+
/// <summary>
333338
/// Placeholder editions for testing feature resolution. These should not be
334339
/// used or relied on outside of tests.
335340
/// </summary>

‎php/ext/google/protobuf/php-upb.c‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
13881388
const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
13891389
const upb_MiniTableEnum google__protobuf__Edition_enum_init = {
13901390
64,
1391-
9,
1391+
10,
13921392
{
13931393
0x7,
13941394
0x0,
@@ -1397,6 +1397,7 @@ const upb_MiniTableEnum google__protobuf__Edition_enum_init = {
13971397
0x3e7,
13981398
0x3e8,
13991399
0x3e9,
1400+
0x270f,
14001401
0x1869d,
14011402
0x1869e,
14021403
0x1869f,
@@ -1655,7 +1656,7 @@ const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
16551656

16561657

16571658

1658-
static const char descriptor[13195] = {
1659+
static const char descriptor[13218] = {
16591660
'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o',
16601661
't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i',
16611662
'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017',
@@ -2712,7 +2713,7 @@ static const char descriptor[13195] = {
27122713
'n', 't', 'i', 'c', '\"', '(', '\n', '\010', 'S', 'e', 'm', 'a',
27132714
'n', 't', 'i', 'c', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E',
27142715
'\020', '\000', '\022', '\007', '\n', '\003', 'S', 'E', 'T', '\020', '\001', '\022',
2715-
'\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', '\247',
2716+
'\t', '\n', '\005', 'A', 'L', 'I', 'A', 'S', '\020', '\002', '*', '\276',
27162717
'\002', '\n', '\007', 'E', 'd', 'i', 't', 'i', 'o', 'n', '\022', '\023',
27172718
'\n', '\017', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'U', 'N',
27182719
'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\016', 'E',
@@ -2724,38 +2725,40 @@ static const char descriptor[13195] = {
27242725
'\n', '\014', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '2', '0',
27252726
'2', '3', '\020', '\350', '\007', '\022', '\021', '\n', '\014', 'E', 'D', 'I',
27262727
'T', 'I', 'O', 'N', '_', '2', '0', '2', '4', '\020', '\351', '\007',
2728+
'\022', '\025', '\n', '\020', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_',
2729+
'U', 'N', 'S', 'T', 'A', 'B', 'L', 'E', '\020', '\217', 'N', '\022',
2730+
'\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '1',
2731+
'_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\001',
27272732
'\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_',
2728-
'1', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020',
2729-
'\001', '\022', '\027', '\n', '\023', 'E', 'D', 'I', 'T', 'I', 'O', 'N',
2730-
'_', '2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y',
2731-
'\020', '\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O',
2732-
'N', '_', '9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T',
2733-
'_', 'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n',
2734-
'\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9',
2735-
'9', '8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y',
2736-
'\020', '\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T',
2737-
'I', 'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E',
2738-
'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', '\006', '\022',
2739-
'\023', '\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M',
2740-
'A', 'X', '\020', '\377', '\377', '\377', '\377', '\007', '*', 'U', '\n', '\020',
2741-
'S', 'y', 'm', 'b', 'o', 'l', 'V', 'i', 's', 'i', 'b', 'i',
2742-
'l', 'i', 't', 'y', '\022', '\024', '\n', '\020', 'V', 'I', 'S', 'I',
2743-
'B', 'I', 'L', 'I', 'T', 'Y', '_', 'U', 'N', 'S', 'E', 'T',
2744-
'\020', '\000', '\022', '\024', '\n', '\020', 'V', 'I', 'S', 'I', 'B', 'I',
2745-
'L', 'I', 'T', 'Y', '_', 'L', 'O', 'C', 'A', 'L', '\020', '\001',
2746-
'\022', '\025', '\n', '\021', 'V', 'I', 'S', 'I', 'B', 'I', 'L', 'I',
2747-
'T', 'Y', '_', 'E', 'X', 'P', 'O', 'R', 'T', '\020', '\002', 'B',
2748-
'~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l',
2749-
'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020',
2750-
'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r',
2751-
'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g',
2752-
'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r',
2753-
'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't',
2754-
'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p',
2755-
't', 'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G',
2756-
'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.',
2757-
'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f',
2758-
'l', 'e', 'c', 't', 'i', 'o', 'n',
2733+
'2', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020',
2734+
'\002', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I', 'O', 'N',
2735+
'_', '9', '9', '9', '9', '7', '_', 'T', 'E', 'S', 'T', '_',
2736+
'O', 'N', 'L', 'Y', '\020', '\235', '\215', '\006', '\022', '\035', '\n', '\027',
2737+
'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', '9', '9', '9', '9',
2738+
'8', '_', 'T', 'E', 'S', 'T', '_', 'O', 'N', 'L', 'Y', '\020',
2739+
'\236', '\215', '\006', '\022', '\035', '\n', '\027', 'E', 'D', 'I', 'T', 'I',
2740+
'O', 'N', '_', '9', '9', '9', '9', '9', '_', 'T', 'E', 'S',
2741+
'T', '_', 'O', 'N', 'L', 'Y', '\020', '\237', '\215', '\006', '\022', '\023',
2742+
'\n', '\013', 'E', 'D', 'I', 'T', 'I', 'O', 'N', '_', 'M', 'A',
2743+
'X', '\020', '\377', '\377', '\377', '\377', '\007', '*', 'U', '\n', '\020', 'S',
2744+
'y', 'm', 'b', 'o', 'l', 'V', 'i', 's', 'i', 'b', 'i', 'l',
2745+
'i', 't', 'y', '\022', '\024', '\n', '\020', 'V', 'I', 'S', 'I', 'B',
2746+
'I', 'L', 'I', 'T', 'Y', '_', 'U', 'N', 'S', 'E', 'T', '\020',
2747+
'\000', '\022', '\024', '\n', '\020', 'V', 'I', 'S', 'I', 'B', 'I', 'L',
2748+
'I', 'T', 'Y', '_', 'L', 'O', 'C', 'A', 'L', '\020', '\001', '\022',
2749+
'\025', '\n', '\021', 'V', 'I', 'S', 'I', 'B', 'I', 'L', 'I', 'T',
2750+
'Y', '_', 'E', 'X', 'P', 'O', 'R', 'T', '\020', '\002', 'B', '~',
2751+
'\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e',
2752+
'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D',
2753+
'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o',
2754+
't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l',
2755+
'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g',
2756+
'/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y',
2757+
'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't',
2758+
'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P',
2759+
'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P',
2760+
'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l',
2761+
'e', 'c', 't', 'i', 'o', 'n',
27592762
};
27602763

27612764
static _upb_DefPool_Init *deps[1] = {

‎php/ext/google/protobuf/php-upb.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6234,6 +6234,7 @@ typedef enum {
62346234
google_protobuf_EDITION_PROTO3 = 999,
62356235
google_protobuf_EDITION_2023 = 1000,
62366236
google_protobuf_EDITION_2024 = 1001,
6237+
google_protobuf_EDITION_UNSTABLE = 9999,
62376238
google_protobuf_EDITION_99997_TEST_ONLY = 99997,
62386239
google_protobuf_EDITION_99998_TEST_ONLY = 99998,
62396240
google_protobuf_EDITION_99999_TEST_ONLY = 99999,

‎php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎php/src/Google/Protobuf/Internal/Edition.php‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ruby/ext/google/protobuf_c/ruby-upb.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ const upb_MiniTable google__protobuf__GeneratedCodeInfo__Annotation_msg_init = {
13881388
const upb_MiniTable* google__protobuf__GeneratedCodeInfo__Annotation_msg_init_ptr = &google__protobuf__GeneratedCodeInfo__Annotation_msg_init;
13891389
const upb_MiniTableEnum google__protobuf__Edition_enum_init = {
13901390
64,
1391-
9,
1391+
10,
13921392
{
13931393
0x7,
13941394
0x0,
@@ -1397,6 +1397,7 @@ const upb_MiniTableEnum google__protobuf__Edition_enum_init = {
13971397
0x3e7,
13981398
0x3e8,
13991399
0x3e9,
1400+
0x270f,
14001401
0x1869d,
14011402
0x1869e,
14021403
0x1869f,

‎ruby/ext/google/protobuf_c/ruby-upb.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6273,6 +6273,7 @@ typedef enum {
62736273
google_protobuf_EDITION_PROTO3 = 999,
62746274
google_protobuf_EDITION_2023 = 1000,
62756275
google_protobuf_EDITION_2024 = 1001,
6276+
google_protobuf_EDITION_UNSTABLE = 9999,
62766277
google_protobuf_EDITION_99997_TEST_ONLY = 99997,
62776278
google_protobuf_EDITION_99998_TEST_ONLY = 99998,
62786279
google_protobuf_EDITION_99999_TEST_ONLY = 99999,

‎src/google/protobuf/descriptor.pb.cc‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/google/protobuf/descriptor.pb.h‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)