Remove unnecessary uses of future changes to descriptor.proto

Author: mkruskal-google

src/google/protobuf/unittest_custom_features.proto

@@ -34,22 +34,13 @@ enum EnumFeature {
   VALUE15 = 15;
 }
 
-enum UnstableEnumFeature {
-  TEST_UNSTABLE_ENUM_FEATURE_UNKNOWN = 0;
-  UNSTABLE1 = 1;
-  UNSTABLE2 = 2;
-  UNSTABLE3 = 3 [feature_support = { edition_introduced: EDITION_UNSTABLE }];
-  UNSTABLE4 = 4;
-}
-
 enum ValueLifetimeFeature {
   TEST_VALUE_LIFETIME_UNKNOWN = 0;
   VALUE_LIFETIME_INHERITED = 1;
   VALUE_LIFETIME_SUPPORT = 2 [feature_support = {
     edition_introduced: EDITION_99997_TEST_ONLY
     edition_deprecated: EDITION_99998_TEST_ONLY
     deprecation_warning: "Custom feature deprecation warning"
-    edition_removed: EDITION_99999_TEST_ONLY
   }];
   VALUE_LIFETIME_EMPTY_SUPPORT = 3 [feature_support = {}];
   VALUE_LIFETIME_FUTURE = 4
@@ -60,8 +51,6 @@ enum ValueLifetimeFeature {
   }];
   VALUE_LIFETIME_REMOVED = 6 [feature_support = {
     edition_deprecated: EDITION_2023
-    edition_removed: EDITION_99997_TEST_ONLY
-    removal_error: "Custom feature removal error"
   }];
 }
 
@@ -187,8 +176,6 @@ message TestCustomFeatures {
       edition_introduced: EDITION_2023
       edition_deprecated: EDITION_2023
       deprecation_warning: "Custom feature deprecation warning"
-      edition_removed: EDITION_2024
-      removal_error: "Custom feature removal error"
     },
     edition_defaults = { edition: EDITION_LEGACY, value: "VALUE1" },
     edition_defaults = { edition: EDITION_2023, value: "VALUE2" },
@@ -201,7 +188,6 @@ message TestCustomFeatures {
     targets = TARGET_TYPE_FIELD,
     feature_support = {
       edition_introduced: EDITION_2023
-      edition_removed: EDITION_2023
     },
     edition_defaults = { edition: EDITION_LEGACY, value: "VALUE1" }
   ];
@@ -221,8 +207,6 @@ message TestCustomFeatures {
     targets = TARGET_TYPE_FIELD,
     feature_support = {
       edition_introduced: EDITION_PROTO3
-      edition_removed: EDITION_2023
-      removal_error: "Custom feature removal error"
     },
     edition_defaults = { edition: EDITION_LEGACY, value: "VALUE1" },
     edition_defaults = { edition: EDITION_2023, value: "VALUE2" }
@@ -235,8 +219,6 @@ message TestCustomFeatures {
       edition_introduced: EDITION_2023
       edition_deprecated: EDITION_99998_TEST_ONLY
       deprecation_warning: "Custom feature deprecation warning"
-      edition_removed: EDITION_99999_TEST_ONLY
-      removal_error: "Custom feature removal error"
     },
     edition_defaults = {
       edition: EDITION_LEGACY,
@@ -253,32 +235,4 @@ message TestCustomFeatures {
       value: "VALUE_LIFETIME_FUTURE"
     }
   ];
-
-  UnstableEnumFeature new_unstable_feature = 22 [
-    retention = RETENTION_RUNTIME,
-    targets = TARGET_TYPE_FILE,
-    targets = TARGET_TYPE_FIELD,
-    feature_support = { edition_introduced: EDITION_UNSTABLE },
-    edition_defaults = { edition: EDITION_LEGACY, value: "UNSTABLE1" },
-    edition_defaults = { edition: EDITION_UNSTABLE, value: "UNSTABLE2" }
-  ];
-
-  UnstableEnumFeature unstable_existing_feature = 23 [
-    retention = RETENTION_RUNTIME,
-    targets = TARGET_TYPE_ENUM,
-    feature_support.edition_introduced = EDITION_2023,
-    edition_defaults = { edition: EDITION_LEGACY, value: "UNSTABLE1" },
-    edition_defaults = { edition: EDITION_2023, value: "UNSTABLE2" },
-    edition_defaults = { edition: EDITION_UNSTABLE, value: "UNSTABLE3" }
-  ];
-  UnstableEnumFeature removed_unstable_feature = 24 [
-    retention = RETENTION_RUNTIME,
-    targets = TARGET_TYPE_METHOD,
-    feature_support = {
-      edition_introduced: EDITION_2023,
-      edition_removed: EDITION_UNSTABLE,
-      removal_error: "Custom feature removal error"
-    },
-    edition_defaults = { edition: EDITION_LEGACY, value: "UNSTABLE1" }
-  ];
 }