diff --git a/conformance/test_protos/test_messages_edition_unstable.proto b/conformance/test_protos/test_messages_edition_unstable.proto index 3b41c930e1c2e..9fb04ed472487 100644 --- a/conformance/test_protos/test_messages_edition_unstable.proto +++ b/conformance/test_protos/test_messages_edition_unstable.proto @@ -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; @@ -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; diff --git a/editions/defaults_test.cc b/editions/defaults_test.cc index f146342bf5c09..4f3fbe78561ef 100644 --- a/editions/defaults_test.cc +++ b/editions/defaults_test.cc @@ -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) { @@ -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 diff --git a/src/google/protobuf/compiler/code_generator_unittest.cc b/src/google/protobuf/compiler/code_generator_unittest.cc index 197550b860ab7..a5be7addda9bf 100644 --- a/src/google/protobuf/compiler/code_generator_unittest.cc +++ b/src/google/protobuf/compiler/code_generator_unittest.cc @@ -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 {} diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc index 913fc2c4b4246..1a78f10273898 100644 --- a/src/google/protobuf/compiler/command_line_interface_unittest.cc +++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc @@ -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 {} @@ -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 {} diff --git a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h index be8f0382171d1..8589967f5e827 100755 --- a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h +++ b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h @@ -60,7 +60,7 @@ namespace protobuf { namespace internal { template <> inline ::absl::string_view GetFeatureSetDefaultsData<::pb::CSharpFeatures>() { - static constexpr char kDefaults[] = "CiEYhAciA+I+ACoXCAEQAhgCIAMoATACOAJAAUgB4j4CCAAKIRjnByID4j4AKhcIAhABGAEgAigBMAE4AkABSAHiPgIIAAohGOgHIg8IARABGAEgAigBMAHiPgAqCzgCQAFIAeI+AggACiEY6QciEwgBEAEYASACKAEwATgBQALiPgAqB0gB4j4CCAAKIRjqByIXCAEQARgBIAIoATABOANABEgC4j4CCAAqA+I+ACDmByjqBw=="; + static constexpr char kDefaults[] = "CiEYhAciA+I+ACoXCAEQAhgCIAMoATACOAJAAUgB4j4CCAAKIRjnByID4j4AKhcIAhABGAEgAigBMAE4AkABSAHiPgIIAAohGOgHIg8IARABGAEgAigBMAHiPgAqCzgCQAFIAeI+AggACiEY6QciEwgBEAEYASACKAEwATgBQALiPgAqB0gB4j4CCAAKIRjqByIXCAEQARgBIAIoATABOANAAkgC4j4CCAAqA+I+ACDmByjqBw=="; return kDefaults; } } // namespace internal diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h index fb850f1868144..fcfcc03271dd9 100644 --- a/src/google/protobuf/compiler/java/java_features.pb.h +++ b/src/google/protobuf/compiler/java/java_features.pb.h @@ -80,7 +80,7 @@ internal::EnumTraitsT<::pb::JavaFeatures_Utf8Validation_internal_data_> namespace internal { template <> inline ::absl::string_view GetFeatureSetDefaultsData<::pb::JavaFeatures>() { - static constexpr char kDefaults[] = "CikYhAciA8o+ACofCAEQAhgCIAMoATACOAJAAUgByj4KCAEQARgAIAEoAwopGOcHIgPKPgAqHwgCEAEYASACKAEwATgCQAFIAco+CggAEAEYACABKAMKKRjoByITCAEQARgBIAIoATAByj4ECAAQASoPOAJAAUgByj4GGAAgASgDCikY6QciGwgBEAEYASACKAEwATgBQALKPggIABABGAAoASoHSAHKPgIgAAopGOoHIh0IARABGAEgAigBMAE4A0AESALKPggIABABGAAoASoFyj4CIAAg5gco6gc="; + static constexpr char kDefaults[] = "CikYhAciA8o+ACofCAEQAhgCIAMoATACOAJAAUgByj4KCAEQARgAIAEoAwopGOcHIgPKPgAqHwgCEAEYASACKAEwATgCQAFIAco+CggAEAEYACABKAMKKRjoByITCAEQARgBIAIoATAByj4ECAAQASoPOAJAAUgByj4GGAAgASgDCikY6QciGwgBEAEYASACKAEwATgBQALKPggIABABGAAoASoHSAHKPgIgAAopGOoHIh0IARABGAEgAigBMAE4A0ACSALKPggIABABGAAoASoFyj4CIAAg5gco6gc="; return kDefaults; } } // namespace internal diff --git a/src/google/protobuf/cpp_edition_defaults.h b/src/google/protobuf/cpp_edition_defaults.h index 95964a81fccc5..48642fd1347a8 100644 --- a/src/google/protobuf/cpp_edition_defaults.h +++ b/src/google/protobuf/cpp_edition_defaults.h @@ -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 diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h index de11ec0398bf6..0c603d48a1674 100644 --- a/src/google/protobuf/cpp_features.pb.h +++ b/src/google/protobuf/cpp_features.pb.h @@ -71,7 +71,7 @@ internal::EnumTraitsT<::pb::CppFeatures_StringType_internal_data_> namespace internal { template <> inline ::absl::string_view GetFeatureSetDefaultsData<::pb::CppFeatures>() { - static constexpr char kDefaults[] = "CicYhAciA8I+ACodCAEQAhgCIAMoATACOAJAAUgBwj4ICAEQAxgAIAEKJxjnByIDwj4AKh0IAhABGAEgAigBMAE4AkABSAHCPggIABADGAAgAQonGOgHIhMIARABGAEgAigBMAHCPgQIABADKg04AkABSAHCPgQYACABCicY6QciGQgBEAEYASACKAEwATgBQALCPgYIABABGAEqB0gBwj4CIAEKJxjqByIbCAEQARgBIAIoATABOANABEgCwj4GCAAQARgBKgXCPgIgAQonGI9OIh0IARABGAEgAigBMAE4A0AESALCPggIABABGAEgASoDwj4AIOYHKOoH"; + static constexpr char kDefaults[] = "CicYhAciA8I+ACodCAEQAhgCIAMoATACOAJAAUgBwj4ICAEQAxgAIAEKJxjnByIDwj4AKh0IAhABGAEgAigBMAE4AkABSAHCPggIABADGAAgAQonGOgHIhMIARABGAEgAigBMAHCPgQIABADKg04AkABSAHCPgQYACABCicY6QciGQgBEAEYASACKAEwATgBQALCPgYIABABGAEqB0gBwj4CIAEKJxjqByIbCAEQARgBIAIoATABOANAAkgCwj4GCAAQARgBKgXCPgIgAQonGI9OIh0IARABGAEgAigBMAE4A0ACSALCPggIABABGAEgASoDwj4AIOYHKOoH"; return kDefaults; } } // namespace internal diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index 5d523b50479e8..b8dc8a1db4bba 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -7568,7 +7568,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB "\024\n\014double_value\030\006 \001(\001\022\024\n\014string_value\030\007 " "\001(\014\022\027\n\017aggregate_value\030\010 \001(\t\0323\n\010NamePart" "\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_extension\030\002 \002(" - "\010\"\336\020\n\nFeatureSet\022\202\001\n\016field_presence\030\001 \001(" + "\010\"\320\020\n\nFeatureSet\022\202\001\n\016field_presence\030\001 \001(" "\0162).google.protobuf.FeatureSet.FieldPres" "enceB\?\210\001\001\230\001\004\230\001\001\242\001\r\022\010EXPLICIT\030\204\007\242\001\r\022\010IMPL" "ICIT\030\347\007\242\001\r\022\010EXPLICIT\030\350\007\262\001\003\010\350\007\022b\n\tenum_ty" @@ -7590,81 +7590,81 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB "ogle.protobuf.FeatureSet.EnforceNamingSt" "yleBZ\210\001\002\230\001\001\230\001\002\230\001\003\230\001\004\230\001\005\230\001\006\230\001\007\230\001\010\230\001\t\242\001\021\022\014" "STYLE_LEGACY\030\204\007\242\001\016\022\tSTYLE2024\030\351\007\242\001\016\022\tSTY" - "LE2026\030\352\007\262\001\003\010\351\007\022\256\001\n\031default_symbol_visib" + "LE2026\030\352\007\262\001\003\010\351\007\022\240\001\n\031default_symbol_visib" "ility\030\010 \001(\0162E.google.protobuf.FeatureSet" ".VisibilityFeature.DefaultSymbolVisibili" - "tyBD\210\001\002\230\001\001\242\001\017\022\nEXPORT_ALL\030\204\007\242\001\025\022\020EXPORT_" - "TOP_LEVEL\030\351\007\242\001\013\022\006STRICT\030\352\007\262\001\003\010\351\007\022\257\001\n\024enf" - "orce_proto_limits\030\t \001(\0162A.google.protobu" - "f.FeatureSet.ProtoLimitsFeature.EnforceP" - "rotoLimitsBN\210\001\002\230\001\006\230\001\003\230\001\004\230\001\005\242\001\036\022\031LEGACY_N" - "O_EXPLICIT_LIMITS\030\204\007\242\001\025\022\020PROTO_LIMITS202" - "6\030\352\007\262\001\003\010\352\007\032\241\001\n\021VisibilityFeature\"\201\001\n\027Def" - "aultSymbolVisibility\022%\n!DEFAULT_SYMBOL_V" - "ISIBILITY_UNKNOWN\020\000\022\016\n\nEXPORT_ALL\020\001\022\024\n\020E" - "XPORT_TOP_LEVEL\020\002\022\r\n\tLOCAL_ALL\020\003\022\n\n\006STRI" - "CT\020\004J\010\010\001\020\200\200\200\200\002\032y\n\022ProtoLimitsFeature\"c\n\022" - "EnforceProtoLimits\022\030\n\024PROTO_LIMITS_UNKNO" - "WN\020\000\022\035\n\031LEGACY_NO_EXPLICIT_LIMITS\020\001\022\024\n\020P" - "ROTO_LIMITS2026\020\002\"\\\n\rFieldPresence\022\032\n\026FI" - "ELD_PRESENCE_UNKNOWN\020\000\022\014\n\010EXPLICIT\020\001\022\014\n\010" - "IMPLICIT\020\002\022\023\n\017LEGACY_REQUIRED\020\003\"7\n\010EnumT" - "ype\022\025\n\021ENUM_TYPE_UNKNOWN\020\000\022\010\n\004OPEN\020\001\022\n\n\006" - "CLOSED\020\002\"V\n\025RepeatedFieldEncoding\022#\n\037REP" - "EATED_FIELD_ENCODING_UNKNOWN\020\000\022\n\n\006PACKED" - "\020\001\022\014\n\010EXPANDED\020\002\"I\n\016Utf8Validation\022\033\n\027UT" - "F8_VALIDATION_UNKNOWN\020\000\022\n\n\006VERIFY\020\002\022\010\n\004N" - "ONE\020\003\"\004\010\001\020\001\"S\n\017MessageEncoding\022\034\n\030MESSAG" - "E_ENCODING_UNKNOWN\020\000\022\023\n\017LENGTH_PREFIXED\020" - "\001\022\r\n\tDELIMITED\020\002\"H\n\nJsonFormat\022\027\n\023JSON_F" - "ORMAT_UNKNOWN\020\000\022\t\n\005ALLOW\020\001\022\026\n\022LEGACY_BES" - "T_EFFORT\020\002\"f\n\022EnforceNamingStyle\022 \n\034ENFO" - "RCE_NAMING_STYLE_UNKNOWN\020\000\022\r\n\tSTYLE2024\020" - "\001\022\020\n\014STYLE_LEGACY\020\002\022\r\n\tSTYLE2026\020\003*\006\010\350\007\020" - "\213N*\006\010\213N\020\220N*\006\010\220N\020\221NJ\006\010\347\007\020\350\007\"\230\003\n\022FeatureSe" - "tDefaults\022N\n\010defaults\030\001 \003(\0132<.google.pro" - "tobuf.FeatureSetDefaults.FeatureSetEditi" - "onDefault\0221\n\017minimum_edition\030\004 \001(\0162\030.goo" - "gle.protobuf.Edition\0221\n\017maximum_edition\030" - "\005 \001(\0162\030.google.protobuf.Edition\032\313\001\n\030Feat" - "ureSetEditionDefault\022)\n\007edition\030\003 \001(\0162\030." - "google.protobuf.Edition\0229\n\024overridable_f" - "eatures\030\004 \001(\0132\033.google.protobuf.FeatureS" - "et\0223\n\016fixed_features\030\005 \001(\0132\033.google.prot" - "obuf.FeatureSetJ\004\010\001\020\002J\004\010\002\020\003R\010features\"\343\001" - "\n\016SourceCodeInfo\022:\n\010location\030\001 \003(\0132(.goo" - "gle.protobuf.SourceCodeInfo.Location\032\206\001\n" - "\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(" - "\005B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022\031\n\021trail" - "ing_comments\030\004 \001(\t\022!\n\031leading_detached_c" - "omments\030\006 \003(\t*\014\010\200\354\312\377\001\020\201\354\312\377\001\"\234\002\n\021Generate" - "dCodeInfo\022A\n\nannotation\030\001 \003(\0132-.google.p" - "rotobuf.GeneratedCodeInfo.Annotation\032\303\001\n" - "\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020\001\022\023\n\013source_" - "file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n\003end\030\004 \001(\005\022H" - "\n\010semantic\030\005 \001(\01626.google.protobuf.Gener" - "atedCodeInfo.Annotation.Semantic\"(\n\010Sema" - "ntic\022\010\n\004NONE\020\000\022\007\n\003SET\020\001\022\t\n\005ALIAS\020\002*\321\002\n\007E" - "dition\022\023\n\017EDITION_UNKNOWN\020\000\022\023\n\016EDITION_L" - "EGACY\020\204\007\022\023\n\016EDITION_PROTO2\020\346\007\022\023\n\016EDITION" - "_PROTO3\020\347\007\022\021\n\014EDITION_2023\020\350\007\022\021\n\014EDITION" - "_2024\020\351\007\022\021\n\014EDITION_2026\020\352\007\022\025\n\020EDITION_U" - "NSTABLE\020\217N\022\027\n\023EDITION_1_TEST_ONLY\020\001\022\027\n\023E" - "DITION_2_TEST_ONLY\020\002\022\035\n\027EDITION_99997_TE" - "ST_ONLY\020\235\215\006\022\035\n\027EDITION_99998_TEST_ONLY\020\236" - "\215\006\022\035\n\027EDITION_99999_TEST_ONLY\020\237\215\006\022\023\n\013EDI" - "TION_MAX\020\377\377\377\377\007*U\n\020SymbolVisibility\022\024\n\020VI" - "SIBILITY_UNSET\020\000\022\024\n\020VISIBILITY_LOCAL\020\001\022\025" - "\n\021VISIBILITY_EXPORT\020\002B~\n\023com.google.prot" - "obufB\020DescriptorProtosH\001Z-google.golang." - "org/protobuf/types/descriptorpb\370\001\001\242\002\003GPB" - "\252\002\032Google.Protobuf.Reflection" + "tyB6\210\001\002\230\001\001\242\001\017\022\nEXPORT_ALL\030\204\007\242\001\025\022\020EXPORT_" + "TOP_LEVEL\030\351\007\262\001\003\010\351\007\022\257\001\n\024enforce_proto_lim" + "its\030\t \001(\0162A.google.protobuf.FeatureSet.P" + "rotoLimitsFeature.EnforceProtoLimitsBN\210\001" + "\002\230\001\006\230\001\003\230\001\004\230\001\005\242\001\036\022\031LEGACY_NO_EXPLICIT_LIM" + "ITS\030\204\007\242\001\025\022\020PROTO_LIMITS2026\030\352\007\262\001\003\010\352\007\032\241\001\n" + "\021VisibilityFeature\"\201\001\n\027DefaultSymbolVisi" + "bility\022%\n!DEFAULT_SYMBOL_VISIBILITY_UNKN" + "OWN\020\000\022\016\n\nEXPORT_ALL\020\001\022\024\n\020EXPORT_TOP_LEVE" + "L\020\002\022\r\n\tLOCAL_ALL\020\003\022\n\n\006STRICT\020\004J\010\010\001\020\200\200\200\200\002" + "\032y\n\022ProtoLimitsFeature\"c\n\022EnforceProtoLi" + "mits\022\030\n\024PROTO_LIMITS_UNKNOWN\020\000\022\035\n\031LEGACY" + "_NO_EXPLICIT_LIMITS\020\001\022\024\n\020PROTO_LIMITS202" + "6\020\002\"\\\n\rFieldPresence\022\032\n\026FIELD_PRESENCE_U" + "NKNOWN\020\000\022\014\n\010EXPLICIT\020\001\022\014\n\010IMPLICIT\020\002\022\023\n\017" + "LEGACY_REQUIRED\020\003\"7\n\010EnumType\022\025\n\021ENUM_TY" + "PE_UNKNOWN\020\000\022\010\n\004OPEN\020\001\022\n\n\006CLOSED\020\002\"V\n\025Re" + "peatedFieldEncoding\022#\n\037REPEATED_FIELD_EN" + "CODING_UNKNOWN\020\000\022\n\n\006PACKED\020\001\022\014\n\010EXPANDED" + "\020\002\"I\n\016Utf8Validation\022\033\n\027UTF8_VALIDATION_" + "UNKNOWN\020\000\022\n\n\006VERIFY\020\002\022\010\n\004NONE\020\003\"\004\010\001\020\001\"S\n" + "\017MessageEncoding\022\034\n\030MESSAGE_ENCODING_UNK" + "NOWN\020\000\022\023\n\017LENGTH_PREFIXED\020\001\022\r\n\tDELIMITED" + "\020\002\"H\n\nJsonFormat\022\027\n\023JSON_FORMAT_UNKNOWN\020" + "\000\022\t\n\005ALLOW\020\001\022\026\n\022LEGACY_BEST_EFFORT\020\002\"f\n\022" + "EnforceNamingStyle\022 \n\034ENFORCE_NAMING_STY" + "LE_UNKNOWN\020\000\022\r\n\tSTYLE2024\020\001\022\020\n\014STYLE_LEG" + "ACY\020\002\022\r\n\tSTYLE2026\020\003*\006\010\350\007\020\213N*\006\010\213N\020\220N*\006\010\220" + "N\020\221NJ\006\010\347\007\020\350\007\"\230\003\n\022FeatureSetDefaults\022N\n\010d" + "efaults\030\001 \003(\0132<.google.protobuf.FeatureS" + "etDefaults.FeatureSetEditionDefault\0221\n\017m" + "inimum_edition\030\004 \001(\0162\030.google.protobuf.E" + "dition\0221\n\017maximum_edition\030\005 \001(\0162\030.google" + ".protobuf.Edition\032\313\001\n\030FeatureSetEditionD" + "efault\022)\n\007edition\030\003 \001(\0162\030.google.protobu" + "f.Edition\0229\n\024overridable_features\030\004 \001(\0132" + "\033.google.protobuf.FeatureSet\0223\n\016fixed_fe" + "atures\030\005 \001(\0132\033.google.protobuf.FeatureSe" + "tJ\004\010\001\020\002J\004\010\002\020\003R\010features\"\343\001\n\016SourceCodeIn" + "fo\022:\n\010location\030\001 \003(\0132(.google.protobuf.S" + "ourceCodeInfo.Location\032\206\001\n\010Location\022\020\n\004p" + "ath\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020leadi" + "ng_comments\030\003 \001(\t\022\031\n\021trailing_comments\030\004" + " \001(\t\022!\n\031leading_detached_comments\030\006 \003(\t*" + "\014\010\200\354\312\377\001\020\201\354\312\377\001\"\234\002\n\021GeneratedCodeInfo\022A\n\na" + "nnotation\030\001 \003(\0132-.google.protobuf.Genera" + "tedCodeInfo.Annotation\032\303\001\n\nAnnotation\022\020\n" + "\004path\030\001 \003(\005B\002\020\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005" + "begin\030\003 \001(\005\022\013\n\003end\030\004 \001(\005\022H\n\010semantic\030\005 \001" + "(\01626.google.protobuf.GeneratedCodeInfo.A" + "nnotation.Semantic\"(\n\010Semantic\022\010\n\004NONE\020\000" + "\022\007\n\003SET\020\001\022\t\n\005ALIAS\020\002*\321\002\n\007Edition\022\023\n\017EDIT" + "ION_UNKNOWN\020\000\022\023\n\016EDITION_LEGACY\020\204\007\022\023\n\016ED" + "ITION_PROTO2\020\346\007\022\023\n\016EDITION_PROTO3\020\347\007\022\021\n\014" + "EDITION_2023\020\350\007\022\021\n\014EDITION_2024\020\351\007\022\021\n\014ED" + "ITION_2026\020\352\007\022\025\n\020EDITION_UNSTABLE\020\217N\022\027\n\023" + "EDITION_1_TEST_ONLY\020\001\022\027\n\023EDITION_2_TEST_" + "ONLY\020\002\022\035\n\027EDITION_99997_TEST_ONLY\020\235\215\006\022\035\n" + "\027EDITION_99998_TEST_ONLY\020\236\215\006\022\035\n\027EDITION_" + "99999_TEST_ONLY\020\237\215\006\022\023\n\013EDITION_MAX\020\377\377\377\377\007" + "*U\n\020SymbolVisibility\022\024\n\020VISIBILITY_UNSET" + "\020\000\022\024\n\020VISIBILITY_LOCAL\020\001\022\025\n\021VISIBILITY_E" + "XPORT\020\002B~\n\023com.google.protobufB\020Descript" + "orProtosH\001Z-google.golang.org/protobuf/t" + "ypes/descriptorpb\370\001\001\242\002\003GPB\252\002\032Google.Prot" + "obuf.Reflection" }; static ::absl::once_flag descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once; PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto = { false, false, - 11749, + 11735, descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto, "google/protobuf/descriptor.proto", &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once, diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index 35c06be81bccc..8cf9d550d4fe2 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -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 { diff --git a/src/google/protobuf/descriptor_unittest.cc b/src/google/protobuf/descriptor_unittest.cc index 5e995ad6f7069..41ffa84f778ad 100644 --- a/src/google/protobuf/descriptor_unittest.cc +++ b/src/google/protobuf/descriptor_unittest.cc @@ -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 diff --git a/src/google/protobuf/feature_resolver_test.cc b/src/google/protobuf/feature_resolver_test.cc index 298188e8c1695..13139260e7270 100644 --- a/src/google/protobuf/feature_resolver_test.cc +++ b/src/google/protobuf/feature_resolver_test.cc @@ -2304,7 +2304,7 @@ TEST_F(FeatureResolverPoolTest, CompileDefaultsMinimumCovered) { 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.test] { file_feature: VALUE2 } } @@ -2322,7 +2322,7 @@ TEST_F(FeatureResolverPoolTest, CompileDefaultsMinimumCovered) { 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.test] { file_feature: VALUE3 } }