Skip to content

Commit 35b3425

Browse files
mkruskal-googlecopybara-github
mkruskal-google
authored and
copybara-github
committed
Stop supporting EDITION_PROTO2 as an alias for EDITION_LEGACY.
PiperOrigin-RevId: 638902499
1 parent fac847c commit 35b3425

File tree

6 files changed

+21
-26
lines changed

6 files changed

+21
-26
lines changed

‎editions/defaults_test.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ TEST(DefaultsTest, Check2023) {
5353
ASSERT_EQ(defaults->minimum_edition(), EDITION_2023);
5454
ASSERT_EQ(defaults->maximum_edition(), EDITION_2023);
5555

56-
EXPECT_EQ(defaults->defaults()[0].edition(), EDITION_PROTO2);
56+
EXPECT_EQ(defaults->defaults()[0].edition(), EDITION_LEGACY);
5757
EXPECT_EQ(defaults->defaults()[1].edition(), EDITION_PROTO3);
5858
EXPECT_EQ(defaults->defaults()[2].edition(), EDITION_2023);
5959
EXPECT_EQ(defaults->defaults()[2].overridable_features().field_presence(),
@@ -72,7 +72,7 @@ TEST(DefaultsTest, CheckFuture) {
7272
ASSERT_EQ(defaults->minimum_edition(), EDITION_2023);
7373
ASSERT_EQ(defaults->maximum_edition(), EDITION_99997_TEST_ONLY);
7474

75-
EXPECT_EQ(defaults->defaults()[0].edition(), EDITION_PROTO2);
75+
EXPECT_EQ(defaults->defaults()[0].edition(), EDITION_LEGACY);
7676
EXPECT_EQ(defaults->defaults()[1].edition(), EDITION_PROTO3);
7777
EXPECT_EQ(defaults->defaults()[2].edition(), EDITION_2023);
7878
EXPECT_EQ(defaults->defaults()[2].overridable_features().field_presence(),
@@ -107,7 +107,7 @@ TEST(DefaultsTest, CheckFarFuture) {
107107
ASSERT_EQ(defaults->minimum_edition(), EDITION_99997_TEST_ONLY);
108108
ASSERT_EQ(defaults->maximum_edition(), EDITION_99999_TEST_ONLY);
109109

110-
EXPECT_EQ(defaults->defaults()[0].edition(), EDITION_PROTO2);
110+
EXPECT_EQ(defaults->defaults()[0].edition(), EDITION_LEGACY);
111111
EXPECT_EQ(defaults->defaults()[1].edition(), EDITION_PROTO3);
112112
EXPECT_EQ(defaults->defaults()[2].edition(), EDITION_2023);
113113
EXPECT_EQ(defaults->defaults()[2].overridable_features().field_presence(),
@@ -152,7 +152,7 @@ TEST(DefaultsTest, Embedded) {
152152
ASSERT_EQ(defaults.minimum_edition(), EDITION_2023);
153153
ASSERT_EQ(defaults.maximum_edition(), EDITION_2023);
154154

155-
EXPECT_EQ(defaults.defaults()[0].edition(), EDITION_PROTO2);
155+
EXPECT_EQ(defaults.defaults()[0].edition(), EDITION_LEGACY);
156156
EXPECT_EQ(defaults.defaults()[1].edition(), EDITION_PROTO3);
157157
EXPECT_EQ(defaults.defaults()[2].edition(), EDITION_2023);
158158
EXPECT_EQ(defaults.defaults()[2].overridable_features().field_presence(),
@@ -176,7 +176,7 @@ TEST(DefaultsTest, EmbeddedBase64) {
176176
ASSERT_EQ(defaults.minimum_edition(), EDITION_2023);
177177
ASSERT_EQ(defaults.maximum_edition(), EDITION_2023);
178178

179-
EXPECT_EQ(defaults.defaults()[0].edition(), EDITION_PROTO2);
179+
EXPECT_EQ(defaults.defaults()[0].edition(), EDITION_LEGACY);
180180
EXPECT_EQ(defaults.defaults()[1].edition(), EDITION_PROTO3);
181181
EXPECT_EQ(defaults.defaults()[2].edition(), EDITION_2023);
182182
EXPECT_EQ(defaults.defaults()[2].overridable_features().field_presence(),
@@ -206,7 +206,7 @@ TEST_F(OverridableDefaultsTest, Proto2) {
206206
ASSERT_OK(feature_defaults);
207207
ASSERT_GE(feature_defaults->defaults().size(), 1);
208208
auto defaults = feature_defaults->defaults(0);
209-
ASSERT_EQ(defaults.edition(), EDITION_PROTO2);
209+
ASSERT_EQ(defaults.edition(), EDITION_LEGACY);
210210

211211

212212
EXPECT_THAT(defaults.overridable_features(), EqualsProto(R"pb([pb.cpp] {}

‎src/google/protobuf/compiler/code_generator_unittest.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ TEST_F(CodeGeneratorTest, BuildFeatureSetDefaults) {
271271
EXPECT_THAT(generator.BuildFeatureSetDefaults(),
272272
IsOkAndHolds(EqualsProto(R"pb(
273273
defaults {
274-
edition: EDITION_PROTO2
274+
edition: EDITION_LEGACY
275275
overridable_features {}
276276
fixed_features {
277277
field_presence: EXPLICIT

‎src/google/protobuf/compiler/command_line_interface_unittest.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,7 @@ TEST_F(CommandLineInterfaceTest, EditionDefaults) {
18721872
FeatureSetDefaults defaults = ReadEditionDefaults("defaults");
18731873
EXPECT_THAT(defaults, EqualsProto(R"pb(
18741874
defaults {
1875-
edition: EDITION_PROTO2
1875+
edition: EDITION_LEGACY
18761876
overridable_features {}
18771877
fixed_features {
18781878
field_presence: EXPLICIT
@@ -1924,7 +1924,7 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMaximum) {
19241924
FeatureSetDefaults defaults = ReadEditionDefaults("defaults");
19251925
EXPECT_THAT(defaults, EqualsProto(R"pb(
19261926
defaults {
1927-
edition: EDITION_PROTO2
1927+
edition: EDITION_LEGACY
19281928
overridable_features {}
19291929
fixed_features {
19301930
field_presence: EXPLICIT
@@ -1977,7 +1977,7 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMinimum) {
19771977
FeatureSetDefaults defaults = ReadEditionDefaults("defaults");
19781978
EXPECT_THAT(defaults, EqualsProto(R"pb(
19791979
defaults {
1980-
edition: EDITION_PROTO2
1980+
edition: EDITION_LEGACY
19811981
overridable_features {}
19821982
fixed_features {
19831983
field_presence: EXPLICIT
@@ -2032,7 +2032,7 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithExtension) {
20322032
EXPECT_EQ(defaults.minimum_edition(), EDITION_PROTO2);
20332033
EXPECT_EQ(defaults.maximum_edition(), EDITION_99999_TEST_ONLY);
20342034
ASSERT_EQ(defaults.defaults_size(), 6);
2035-
EXPECT_EQ(defaults.defaults(0).edition(), EDITION_PROTO2);
2035+
EXPECT_EQ(defaults.defaults(0).edition(), EDITION_LEGACY);
20362036
EXPECT_EQ(defaults.defaults(2).edition(), EDITION_2023);
20372037
EXPECT_EQ(defaults.defaults(3).edition(), EDITION_2024);
20382038
EXPECT_EQ(defaults.defaults(4).edition(), EDITION_99997_TEST_ONLY);

‎src/google/protobuf/cpp_edition_defaults.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// the C++ runtime. This is used for feature resolution under Editions.
66
// NOLINTBEGIN
77
// clang-format off
8-
#define PROTOBUF_INTERNAL_CPP_EDITION_DEFAULTS "\n\035\030\346\007\"\003\302>\000*\023\010\001\020\002\030\002 \003(\0010\002\302>\004\010\001\020\003\n\035\030\347\007\"\003\302>\000*\023\010\002\020\001\030\001 \002(\0010\001\302>\004\010\000\020\003\n\035\030\350\007\"\023\010\001\020\001\030\001 \002(\0010\001\302>\004\010\000\020\003*\003\302>\000\n\035\030\351\007\"\023\010\001\020\001\030\001 \002(\0010\001\302>\004\010\000\020\001*\003\302>\000 \346\007(\351\007"
8+
#define PROTOBUF_INTERNAL_CPP_EDITION_DEFAULTS "\n\035\030\204\007\"\003\302>\000*\023\010\001\020\002\030\002 \003(\0010\002\302>\004\010\001\020\003\n\035\030\347\007\"\003\302>\000*\023\010\002\020\001\030\001 \002(\0010\001\302>\004\010\000\020\003\n\035\030\350\007\"\023\010\001\020\001\030\001 \002(\0010\001\302>\004\010\000\020\003*\003\302>\000\n\035\030\351\007\"\023\010\001\020\001\030\001 \002(\0010\001\302>\004\010\000\020\001*\003\302>\000 \346\007(\351\007"
99
// clang-format on
1010
// NOLINTEND
1111

‎src/google/protobuf/feature_resolver.cc‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,7 @@ absl::Status ValidateDescriptor(const Descriptor& descriptor) {
8181

8282
bool has_legacy_default = false;
8383
for (const auto& d : field.options().edition_defaults()) {
84-
if (d.edition() == Edition::EDITION_LEGACY ||
85-
// TODO Remove this once all features use EDITION_LEGACY.
86-
d.edition() == Edition::EDITION_PROTO2) {
84+
if (d.edition() == Edition::EDITION_LEGACY) {
8785
has_legacy_default = true;
8886
continue;
8987
}
@@ -194,11 +192,6 @@ void CollectEditions(const Descriptor& descriptor, Edition maximum_edition,
194192
for (int i = 0; i < descriptor.field_count(); ++i) {
195193
for (const auto& def : descriptor.field(i)->options().edition_defaults()) {
196194
if (maximum_edition < def.edition()) continue;
197-
// TODO Remove this once all features use EDITION_LEGACY.
198-
if (def.edition() == Edition::EDITION_LEGACY) {
199-
editions.insert(Edition::EDITION_PROTO2);
200-
continue;
201-
}
202195
editions.insert(def.edition());
203196
}
204197
}
@@ -363,8 +356,10 @@ absl::StatusOr<FeatureSetDefaults> FeatureResolver::CompileDefaults(
363356
}
364357
// Sanity check validation conditions above.
365358
ABSL_CHECK(!editions.empty());
366-
// TODO Check that this is always EDITION_LEGACY.
367-
ABSL_CHECK_LE(*editions.begin(), EDITION_PROTO2);
359+
if (*editions.begin() != EDITION_LEGACY) {
360+
return Error("Minimum edition ", *editions.begin(),
361+
" is not EDITION_LEGACY");
362+
}
368363

369364
if (*editions.begin() > minimum_edition) {
370365
return Error("Minimum edition ", minimum_edition,

‎src/google/protobuf/feature_resolver_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ TEST(FeatureResolverTest, CompileDefaultsOverridable) {
351351

352352
TEST(FeatureResolverTest, CreateFromUnsortedDefaults) {
353353
auto valid_defaults = FeatureResolver::CompileDefaults(
354-
FeatureSet::descriptor(), {}, EDITION_PROTO2, EDITION_2023);
354+
FeatureSet::descriptor(), {}, EDITION_LEGACY, EDITION_2023);
355355
ASSERT_OK(valid_defaults);
356356
FeatureSetDefaults defaults = *valid_defaults;
357357

@@ -360,7 +360,7 @@ TEST(FeatureResolverTest, CreateFromUnsortedDefaults) {
360360
EXPECT_THAT(FeatureResolver::Create(EDITION_2023, defaults),
361361
HasError(AllOf(HasSubstr("not strictly increasing."),
362362
HasSubstr("Edition PROTO3 is greater "
363-
"than or equal to edition PROTO2"))));
363+
"than or equal to edition LEGACY"))));
364364
}
365365

366366
TEST(FeatureResolverTest, CreateUnknownEdition) {
@@ -1281,7 +1281,7 @@ TEST_F(FeatureResolverPoolTest, CompileDefaultsInvalidDefaultsTooEarly) {
12811281
EXPECT_THAT(
12821282
FeatureResolver::CompileDefaults(feature_set_, {ext}, EDITION_2023,
12831283
EDITION_2023),
1284-
HasError(HasSubstr("No valid default found for edition 2_TEST_ONLY")));
1284+
HasError(HasSubstr("Minimum edition 2_TEST_ONLY is not EDITION_LEGACY")));
12851285
}
12861286

12871287
TEST_F(FeatureResolverPoolTest, CompileDefaultsMinimumTooEarly) {
@@ -1345,7 +1345,7 @@ TEST_F(FeatureResolverPoolTest, CompileDefaultsMinimumCovered) {
13451345
minimum_edition: EDITION_99997_TEST_ONLY
13461346
maximum_edition: EDITION_99999_TEST_ONLY
13471347
defaults {
1348-
edition: EDITION_PROTO2
1348+
edition: EDITION_LEGACY
13491349
overridable_features {
13501350
[pb.test] {}
13511351
}

0 commit comments

Comments
 (0)