Retired inference-using-bounds and wildcard-variables experiments.

lrhn · Commit Queue · commit f4cadd5a5a55 · 2025-02-19T05:25:10.000-08:00
Change-Id: I5dcc0c7d2b148eb88e6382118d6fc8ee4c9a9489 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/407022 Reviewed-by: Alexander Thomas <athom@google.com> Commit-Queue: Lasse Nielsen <lrn@google.com>
diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
@@ -132,7 +132,7 @@ enum ExperimentalFlag {
   inferenceUsingBounds(
       name: 'inference-using-bounds',
       isEnabledByDefault: true,
-      isExpired: false,
+      isExpired: true,
       experimentEnabledVersion: const Version(3, 7),
       experimentReleasedVersion: const Version(3, 7)),
 
@@ -272,7 +272,7 @@ enum ExperimentalFlag {
   wildcardVariables(
       name: 'wildcard-variables',
       isEnabledByDefault: true,
-      isExpired: false,
+      isExpired: true,
       experimentEnabledVersion: const Version(3, 7),
       experimentReleasedVersion: const Version(3, 7)),
   ;
diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
@@ -781,7 +781,7 @@ class IsExpired {
   static const bool inference_update_4 = false;
 
   /// Expiration status of the experiment "inference-using-bounds"
-  static const bool inference_using_bounds = false;
+  static const bool inference_using_bounds = true;
 
   /// Expiration status of the experiment "inline-class"
   static const bool inline_class = true;
@@ -841,7 +841,7 @@ class IsExpired {
   static const bool variance = false;
 
   /// Expiration status of the experiment "wildcard-variables"
-  static const bool wildcard_variables = false;
+  static const bool wildcard_variables = true;
 }
 
 mixin _CurrentState {
diff --git a/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart b/pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart
@@ -198,7 +198,7 @@ class ExperimentalFlag {
   static const ExperimentalFlag inferenceUsingBounds = const ExperimentalFlag(
       name: 'inference-using-bounds',
       isEnabledByDefault: true,
-      isExpired: false,
+      isExpired: true,
       enabledVersion: const Version(3, 7),
       experimentEnabledVersion: const Version(3, 7),
       experimentReleasedVersion: const Version(3, 7));
@@ -358,7 +358,7 @@ class ExperimentalFlag {
   static const ExperimentalFlag wildcardVariables = const ExperimentalFlag(
       name: 'wildcard-variables',
       isEnabledByDefault: true,
-      isExpired: false,
+      isExpired: true,
       enabledVersion: const Version(3, 7),
       experimentEnabledVersion: const Version(3, 7),
       experimentReleasedVersion: const Version(3, 7));
diff --git a/pkg/front_end/testcases/inference_using_bounds/folder.options b/pkg/front_end/testcases/inference_using_bounds/folder.options
@@ -1 +0,0 @@
---enable-experiment=inference-using-bounds
diff --git a/pkg/front_end/testcases/wildcard_variables/folder.options b/pkg/front_end/testcases/wildcard_variables/folder.options
@@ -1 +0,0 @@
---enable-experiment=wildcard-variables
diff --git a/tests/language/inference_using_bounds/f_bounded_inheritance_hierarchy_root_test.dart b/tests/language/inference_using_bounds/f_bounded_inheritance_hierarchy_root_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// SharedOptions=--enable-experiment=inference-using-bounds
-
 import '../static_type_helper.dart';
 
 class A<X extends A<X>> {}
diff --git a/tests/language/inference_using_bounds/f_bounded_mutually_recursive_test.dart b/tests/language/inference_using_bounds/f_bounded_mutually_recursive_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// SharedOptions=--enable-experiment=inference-using-bounds
-
 import '../static_type_helper.dart';
 
 class A1<X extends A1<X, Y>, Y extends A2<X, Y>> {}
diff --git a/tests/language/inference_using_bounds/pre_experiment/f_bounded_inheritance_hierarchy_root_legacy_error_test.dart b/tests/language/inference_using_bounds/pre_experiment/f_bounded_inheritance_hierarchy_root_legacy_error_test.dart
diff --git a/tests/language/inference_using_bounds/pre_experiment/f_bounded_mutually_recursive_legacy_error_test.dart b/tests/language/inference_using_bounds/pre_experiment/f_bounded_mutually_recursive_legacy_error_test.dart
diff --git a/tests/language/inference_using_bounds/pre_experiment/restricting_choices_using_bounds_legacy_error_test.dart b/tests/language/inference_using_bounds/pre_experiment/restricting_choices_using_bounds_legacy_error_test.dart
diff --git a/tests/language/inference_using_bounds/pre_experiment/type_variable_dependency_left_to_right_legacy_test.dart b/tests/language/inference_using_bounds/pre_experiment/type_variable_dependency_left_to_right_legacy_test.dart
diff --git a/tests/language/inference_using_bounds/pre_experiment/type_variable_dependency_right_to_left_legacy_test.dart b/tests/language/inference_using_bounds/pre_experiment/type_variable_dependency_right_to_left_legacy_test.dart
diff --git a/tests/language/inference_using_bounds/restricting_choices_using_bounds_test.dart b/tests/language/inference_using_bounds/restricting_choices_using_bounds_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// SharedOptions=--enable-experiment=inference-using-bounds
-
 import '../static_type_helper.dart';
 
 // For the motivational issue, see
diff --git a/tests/language/inference_using_bounds/type_variable_dependency_left_to_right_error_test.dart b/tests/language/inference_using_bounds/type_variable_dependency_left_to_right_error_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// SharedOptions=--enable-experiment=inference-using-bounds
-
 class A<X extends Iterable<Y>, Y> {
   A(X x);
   Y? y;
diff --git a/tests/language/inference_using_bounds/type_variable_dependency_right_to_left_test.dart b/tests/language/inference_using_bounds/type_variable_dependency_right_to_left_test.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// SharedOptions=--enable-experiment=inference-using-bounds
-
 import '../static_type_helper.dart';
 
 class A<Y, X extends Iterable<Y>> {
diff --git a/tests/language/wildcard_variables/declarations/class_generic_type_parameter_test.dart b/tests/language/wildcard_variables/declarations/class_generic_type_parameter_test.dart
@@ -4,8 +4,6 @@
 
 // Tests using wildcards in class generic type parameters.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 typedef _ = BB;
diff --git a/tests/language/wildcard_variables/declarations/class_member_test.dart b/tests/language/wildcard_variables/declarations/class_member_test.dart
@@ -4,8 +4,6 @@
 
 // Class methods and getters and setters can still be named `_`.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 class A<_> {
diff --git a/tests/language/wildcard_variables/declarations/enum_test.dart b/tests/language/wildcard_variables/declarations/enum_test.dart
@@ -4,8 +4,6 @@
 
 // Tests the usage of wildcards in enum constructors and fields.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 enum A { _ }
diff --git a/tests/language/wildcard_variables/declarations/extension_type_test.dart b/tests/language/wildcard_variables/declarations/extension_type_test.dart
@@ -5,8 +5,6 @@
 // The representation variable of an extension type can be named `_`, and no
 // formal parameter name is introduced into any scopes.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 extension type Id(int _) {
diff --git a/tests/language/wildcard_variables/declarations/local_function_error_test.dart b/tests/language/wildcard_variables/declarations/local_function_error_test.dart
@@ -4,8 +4,6 @@
 
 // A local function declaration named `_` is non-binding and cannot be accessed.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 void main() {
   void _() {}
 
diff --git a/tests/language/wildcard_variables/declarations/record_type_test.dart b/tests/language/wildcard_variables/declarations/record_type_test.dart
@@ -4,8 +4,6 @@
 
 // Allow positional record fields named `_` in record types.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'dart:async';
 
 import 'package:expect/expect.dart';
diff --git a/tests/language/wildcard_variables/feature_disabled_legacy_error_test.dart b/tests/language/wildcard_variables/feature_disabled_legacy_error_test.dart
diff --git a/tests/language/wildcard_variables/import/import_error_test.dart b/tests/language/wildcard_variables/import/import_error_test.dart
@@ -5,8 +5,6 @@
 // `_` import prefixes are non-binding. This tests that we can't access the
 // top-level declarations of that imported library.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'import_lib.dart' as _;
 
 main() {
diff --git a/tests/language/wildcard_variables/import/import_lib.dart b/tests/language/wildcard_variables/import/import_lib.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 int topLevel = 1;
 
 class C {
diff --git a/tests/language/wildcard_variables/import/import_test.dart b/tests/language/wildcard_variables/import/import_test.dart
@@ -5,8 +5,6 @@
 // Import prefixes named `_` are non-binding, but will provide access to the
 // non-private extensions in that library.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 import 'import_lib.dart' as _;
diff --git a/tests/language/wildcard_variables/initializing_formal_parameters/super_test.dart b/tests/language/wildcard_variables/initializing_formal_parameters/super_test.dart
@@ -5,8 +5,6 @@
 // `super._` will pass on the given actual argument to the corresponding
 // superconstructor parameter.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 void main() {
diff --git a/tests/language/wildcard_variables/initializing_formal_parameters/this_initializer_access_error_test.dart b/tests/language/wildcard_variables/initializing_formal_parameters/this_initializer_access_error_test.dart
@@ -4,8 +4,6 @@
 
 // It's an error for `_` to be accessed inside an initializer list.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 class C {
   var _;
   var other;
diff --git a/tests/language/wildcard_variables/initializing_formal_parameters/this_initializer_multiple_error_test.dart b/tests/language/wildcard_variables/initializing_formal_parameters/this_initializer_multiple_error_test.dart
@@ -4,8 +4,6 @@
 
 // It's an error to have two initializing formals named `_`.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 class C {
   var _;
 
diff --git a/tests/language/wildcard_variables/initializing_formal_parameters/this_test.dart b/tests/language/wildcard_variables/initializing_formal_parameters/this_test.dart
@@ -5,8 +5,6 @@
 // A positional initializing formal named `_` does still initialize a field
 // named `_`, and you can still have a field with that name.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 void main() {
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_catch_rethrow_async_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_catch_rethrow_async_test.dart
@@ -5,8 +5,6 @@
 // Tests multiple catch clause wildcard variable declarations with rethrow and
 // awaits.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import "package:expect/async_helper.dart";
 import 'package:expect/expect.dart';
 
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_catch_rethrow_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_catch_rethrow_test.dart
@@ -4,8 +4,6 @@
 
 // Tests multiple catch clause wildcard variable declarations with rethrow.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 void main() {
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_catch_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_catch_test.dart
@@ -4,8 +4,6 @@
 
 // Tests multiple catch clause wildcard variable declarations.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 void main() {
   try {
     throw '!';
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_for_loop_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_for_loop_test.dart
@@ -4,8 +4,6 @@
 
 // Tests for-loop wildcard variable declarations.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/async_helper.dart';
 
 void main() async {
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_function_parameter_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_function_parameter_test.dart
@@ -4,8 +4,6 @@
 
 // Tests multiple wildcard function parameters.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 class Constructor {
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_local_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_local_test.dart
@@ -4,8 +4,6 @@
 
 // Tests multiple local wildcard variable declarations.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 void main() {
   var _ = 1;
   int _ = 2;
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_type_parameter_error_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_type_parameter_error_test.dart
@@ -5,8 +5,6 @@
 // Tests that formals named `_` in function types don't use the non-binding type
 // parameter `_`.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 void genericFunction<_ extends void Function<_>(_, _), _>() {}
 //                                              ^
 // [analyzer] COMPILE_TIME_ERROR.UNDEFINED_CLASS
diff --git a/tests/language/wildcard_variables/multiple/local_declaration_type_parameter_test.dart b/tests/language/wildcard_variables/multiple/local_declaration_type_parameter_test.dart
@@ -4,8 +4,6 @@
 
 // Tests multiple wildcard generic type parameters.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 // Class type parameters
 class T<_, _> {}
 
diff --git a/tests/language/wildcard_variables/non_binding/class_members_test.dart b/tests/language/wildcard_variables/non_binding/class_members_test.dart
@@ -5,8 +5,6 @@
 // Test the interactions between a wildcard class members, which are binding,
 // with local non-binding wildcard variables.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 void main() {
diff --git a/tests/language/wildcard_variables/non_binding/top_level_const_test.dart b/tests/language/wildcard_variables/non_binding/top_level_const_test.dart
@@ -4,8 +4,6 @@
 
 // Tests that top-level const variables are still binding.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 const _ = 100;
diff --git a/tests/language/wildcard_variables/non_binding/top_level_function_test.dart b/tests/language/wildcard_variables/non_binding/top_level_function_test.dart
@@ -5,8 +5,6 @@
 // Test the interactions between a wildcard top-level function, which is
 // binding, with local non-binding wildcard variables.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 int _(int _) => 2;
diff --git a/tests/language/wildcard_variables/non_binding/top_level_typedef_test.dart b/tests/language/wildcard_variables/non_binding/top_level_typedef_test.dart
@@ -5,8 +5,6 @@
 // Test the interactions between a wildcard typedef, which is binding, with
 // local non-binding wildcard variables.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 typedef _ = Type;
diff --git a/tests/language/wildcard_variables/non_binding/top_level_variable_test.dart b/tests/language/wildcard_variables/non_binding/top_level_variable_test.dart
@@ -5,8 +5,6 @@
 // Test the interactions between a wildcard top-level variable, which is
 // binding, with local non-binding wildcard variables.
 
-// SharedOptions=--enable-experiment=wildcard-variables
-
 import 'package:expect/expect.dart';
 
 var _ = 2;
diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml
@@ -177,6 +177,7 @@ features:
         print('feature enabled');
       }
     help: "Use type parameter bounds more extensively in type inference."
+    expired: true
 
   wildcard-variables:
     enabledIn: '3.7.0'
@@ -187,6 +188,7 @@ features:
         print('feature enabled');
       }
     help: "Local declarations and parameters named `_` are non-binding."
+    expired: true
 
   digit-separators:
     enabledIn: '3.6.0'

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`---enable-experiment=inference-using-bounds`