Skip to content

Make default_symbol_visibility STRICT in edition 2026 #28205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Make default_symbol_visibility STRICT in edition 2026 #28205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions conformance/test_protos/test_messages_edition_unstable.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ option features.message_encoding = DELIMITED;
option java_package = "com.google.protobuf_test_messages.edition_unstable";
option objc_class_prefix = "EditionUnstable";

export message ComplexMessage {
message ComplexMessage {
int32 d = 1;
}

export message TestAllTypesEditionUnstable {
message TestAllTypesEditionUnstable {
// Singular
int32 optional_int32 = 1;

Expand Down Expand Up @@ -51,11 +51,11 @@ export message TestAllTypesEditionUnstable {
extensions 120 to 200;
}

export message ForeignMessageEditionUnstable {
message ForeignMessageEditionUnstable {
int32 c = 1;
}

export enum ForeignEnumEditionUnstable {
enum ForeignEnumEditionUnstable {
FOREIGN_FOO = 0;
FOREIGN_BAR = 1;
FOREIGN_BAZ = 2;
Expand Down
6 changes: 1 addition & 5 deletions editions/defaults_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,6 @@ TEST(DefaultsTest, Check2026) {
EXPECT_EQ(
defaults->defaults()[4].overridable_features().enforce_proto_limits(),
FeatureSet::ProtoLimitsFeature::PROTO_LIMITS2026);
EXPECT_EQ(defaults->defaults()[4]
.overridable_features()
.default_symbol_visibility(),
FeatureSet::VisibilityFeature::STRICT);
}

TEST(DefaultsTest, CheckFuture) {
Expand Down Expand Up @@ -433,7 +429,7 @@ TEST_F(OverridableDefaultsTest, Edition2026) {
message_encoding: LENGTH_PREFIXED
json_format: ALLOW
enforce_naming_style: STYLE2026
default_symbol_visibility: STRICT
default_symbol_visibility: EXPORT_TOP_LEVEL
enforce_proto_limits: PROTO_LIMITS2026
[pb.cpp] {
legacy_closed_enum: false
Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/compiler/code_generator_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ TEST_F(CodeGeneratorTest, BuildFeatureSetDefaults) {
message_encoding: LENGTH_PREFIXED
json_format: ALLOW
enforce_naming_style: STYLE2026
default_symbol_visibility: STRICT
default_symbol_visibility: EXPORT_TOP_LEVEL
enforce_proto_limits: PROTO_LIMITS2026
}
fixed_features {}
Expand Down
4 changes: 2 additions & 2 deletions src/google/protobuf/compiler/command_line_interface_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,7 +2706,7 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMaximum) {
message_encoding: LENGTH_PREFIXED
json_format: ALLOW
enforce_naming_style: STYLE2026
default_symbol_visibility: STRICT
default_symbol_visibility: EXPORT_TOP_LEVEL
enforce_proto_limits: PROTO_LIMITS2026
}
fixed_features {}
Expand Down Expand Up @@ -2824,7 +2824,7 @@ TEST_F(CommandLineInterfaceTest, EditionDefaultsWithMinimum) {
message_encoding: LENGTH_PREFIXED
json_format: ALLOW
enforce_naming_style: STYLE2026
default_symbol_visibility: STRICT
default_symbol_visibility: EXPORT_TOP_LEVEL
enforce_proto_limits: PROTO_LIMITS2026
}
fixed_features {}
Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/compiler/csharp/c_sharp_features.pb.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/google/protobuf/compiler/java/java_features.pb.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/google/protobuf/cpp_edition_defaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// the C++ runtime. This is used for feature resolution under Editions.
// NOLINTBEGIN
// clang-format off
#define PROTOBUF_INTERNAL_CPP_EDITION_DEFAULTS "\n\'\030\204\007\"\003\302>\000*\035\010\001\020\002\030\002 \003(\0010\0028\002@\001H\001\302>\010\010\001\020\003\030\000 \001\n\'\030\347\007\"\003\302>\000*\035\010\002\020\001\030\001 \002(\0010\0018\002@\001H\001\302>\010\010\000\020\003\030\000 \001\n\'\030\350\007\"\023\010\001\020\001\030\001 \002(\0010\001\302>\004\010\000\020\003*\r8\002@\001H\001\302>\004\030\000 \001\n\'\030\351\007\"\031\010\001\020\001\030\001 \002(\0010\0018\001@\002\302>\006\010\000\020\001\030\001*\007H\001\302>\002 \001\n\'\030\217N\"\035\010\001\020\001\030\001 \002(\0010\0018\003@\004H\002\302>\010\010\000\020\001\030\001 \001*\003\302>\000 \346\007(\351\007"
#define PROTOBUF_INTERNAL_CPP_EDITION_DEFAULTS "\n\'\030\204\007\"\003\302>\000*\035\010\001\020\002\030\002 \003(\0010\0028\002@\001H\001\302>\010\010\001\020\003\030\000 \001\n\'\030\347\007\"\003\302>\000*\035\010\002\020\001\030\001 \002(\0010\0018\002@\001H\001\302>\010\010\000\020\003\030\000 \001\n\'\030\350\007\"\023\010\001\020\001\030\001 \002(\0010\001\302>\004\010\000\020\003*\r8\002@\001H\001\302>\004\030\000 \001\n\'\030\351\007\"\031\010\001\020\001\030\001 \002(\0010\0018\001@\002\302>\006\010\000\020\001\030\001*\007H\001\302>\002 \001\n\'\030\217N\"\035\010\001\020\001\030\001 \002(\0010\0018\003@\002H\002\302>\010\010\000\020\001\030\001 \001*\003\302>\000 \346\007(\351\007"
// clang-format on
// NOLINTEND

Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/cpp_features.pb.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

138 changes: 69 additions & 69 deletions src/google/protobuf/descriptor.pb.cc
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/google/protobuf/descriptor.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,8 +1210,7 @@ message FeatureSet {
edition_introduced: EDITION_2024,
},
edition_defaults = { edition: EDITION_LEGACY, value: "EXPORT_ALL" },
edition_defaults = { edition: EDITION_2024, value: "EXPORT_TOP_LEVEL" },
edition_defaults = { edition: EDITION_2026, value: "STRICT" }
edition_defaults = { edition: EDITION_2024, value: "EXPORT_TOP_LEVEL" }
];

message ProtoLimitsFeature {
Expand Down
2 changes: 1 addition & 1 deletion src/google/protobuf/descriptor_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9905,7 +9905,7 @@ TEST_F(FeaturesTest, Edition2026Defaults) {
message_encoding: LENGTH_PREFIXED
json_format: ALLOW
enforce_naming_style: STYLE2026
default_symbol_visibility: STRICT
default_symbol_visibility: EXPORT_TOP_LEVEL
enforce_proto_limits: PROTO_LIMITS2026
[pb.cpp] {
legacy_closed_enum: false
Expand Down
Loading
Loading