Retire inference-update-3 experiment introduced in Dart 3.4.

The expriment is now retired in Dart 3.5, and the flag stops being valid. Change-Id: I1ecb087d45b90e98a7f0d3c15a6c8038a1c6982e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/365260 Reviewed-by: Nate Bosch <nbosch@google.com> Reviewed-by: Johnni Winther <johnniwinther@google.com> Reviewed-by: Paul Berry <paulberry@google.com> Commit-Queue: Lasse Nielsen <lrn@google.com>
dart-lang · May 3, 2024 · 281241e · 281241e · mnordine · May 3, 2024
1 parent 0d8bb0e
commit 281241e
Show file tree

Hide file tree

Showing 31 changed files with 4 additions and 56 deletions.
diff --git a/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart b/pkg/_fe_analyzer_shared/lib/src/experiments/flags.dart
@@ -83,7 +83,7 @@ enum ExperimentalFlag {
   inferenceUpdate3(
       name: 'inference-update-3',
       isEnabledByDefault: true,
-      isExpired: false,
+      isExpired: true,
       experimentEnabledVersion: const Version(3, 4),
       experimentReleasedVersion: const Version(3, 4)),
 

diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.g.dart
@@ -548,7 +548,7 @@ class IsExpired {
   static const bool inference_update_2 = true;
 
   /// Expiration status of the experiment "inference-update-3"
-  static const bool inference_update_3 = false;
+  static const bool inference_update_3 = true;
 
   /// Expiration status of the experiment "inline-class"
   static const bool inline_class = true;

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
@@ -142,7 +142,7 @@ class ExperimentalFlag {
   static const ExperimentalFlag inferenceUpdate3 = const ExperimentalFlag(
       name: 'inference-update-3',
       isEnabledByDefault: true,
-      isExpired: false,
+      isExpired: true,
       enabledVersion: const Version(3, 4),
       experimentEnabledVersion: const Version(3, 4),
       experimentReleasedVersion: const Version(3, 4));

diff --git a/pkg/front_end/testcases/inference_update_3/folder.options b/pkg/front_end/testcases/inference_update_3/folder.options
@@ -1 +0,0 @@
---enable-experiment=inference-update-3

diff --git a/tests/language/inference_update_3/conditional_expression_test.dart b/tests/language/inference_update_3/conditional_expression_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using conditional expressions.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/...guage/inference_update_3/if_null_assignment_explicit_extension_index_expression_test.dart b/...guage/inference_update_3/if_null_assignment_explicit_extension_index_expression_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is an ordinary index expression that
 // refers to operators defined in an extension, using explicit extension syntax.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/...ence_update_3/if_null_assignment_explicit_extension_null_aware_index_expression_test.dart b/...ence_update_3/if_null_assignment_explicit_extension_null_aware_index_expression_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a null-aware index expression that
 // refers to operators defined in an extension, using explicit extension syntax.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>?` for the operand, or `Iterable<_>?`

diff --git a/...ge/inference_update_3/if_null_assignment_explicit_extension_null_aware_property_test.dart b/...ge/inference_update_3/if_null_assignment_explicit_extension_null_aware_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a null-aware access to an extension
 // property, using explicit extension syntax.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>?` for the operand, or `Iterable<_>?`

diff --git a/tests/language/inference_update_3/if_null_assignment_explicit_extension_property_test.dart b/tests/language/inference_update_3/if_null_assignment_explicit_extension_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is an access to an extension property,
 // using explicit extension syntax.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/...language/inference_update_3/if_null_assignment_explicit_extension_this_property_test.dart b/...language/inference_update_3/if_null_assignment_explicit_extension_this_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a property of the current
 // extension, accessed through explicit `this` using explicit extension syntax.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_explicit_this_property_test.dart b/tests/language/inference_update_3/if_null_assignment_explicit_this_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a property of the current class,
 // accessed through explicit `this`.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/...inference_update_3/if_null_assignment_implicit_extension_explicit_this_property_test.dart b/...inference_update_3/if_null_assignment_implicit_extension_explicit_this_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a property of the current
 // extension, accessed through explicit `this`.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/...inference_update_3/if_null_assignment_implicit_extension_implicit_this_property_test.dart b/...inference_update_3/if_null_assignment_implicit_extension_implicit_this_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a property of the current
 // extension, accessed through implicit `this`.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/...guage/inference_update_3/if_null_assignment_implicit_extension_index_expression_test.dart b/...guage/inference_update_3/if_null_assignment_implicit_extension_index_expression_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is an ordinary index expression that
 // refers to operators defined in an extension.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/...ence_update_3/if_null_assignment_implicit_extension_null_aware_index_expression_test.dart b/...ence_update_3/if_null_assignment_implicit_extension_null_aware_index_expression_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a null-aware index expression that
 // refers to operators defined in an extension.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>?` for the operand, or `Iterable<_>?`

diff --git a/...ge/inference_update_3/if_null_assignment_implicit_extension_null_aware_property_test.dart b/...ge/inference_update_3/if_null_assignment_implicit_extension_null_aware_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a null-aware access to an extension
 // property.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>?` for the operand, or `Iterable<_>?`

diff --git a/tests/language/inference_update_3/if_null_assignment_implicit_extension_property_test.dart b/tests/language/inference_update_3/if_null_assignment_implicit_extension_property_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is an access to an extension property.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_implicit_this_property_test.dart b/tests/language/inference_update_3/if_null_assignment_implicit_this_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a property of the current class,
 // accessed through implicit `this`.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_index_expression_test.dart b/tests/language/inference_update_3/if_null_assignment_index_expression_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is an ordinary index expression.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_local_test.dart b/tests/language/inference_update_3/if_null_assignment_local_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is a local variable.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_null_aware_index_expression_test.dart b/tests/language/inference_update_3/if_null_assignment_null_aware_index_expression_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is a null-aware index expression.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>?` for the operand, or `Iterable<_>?`

diff --git a/tests/language/inference_update_3/if_null_assignment_null_aware_property_test.dart b/tests/language/inference_update_3/if_null_assignment_null_aware_property_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is a null-aware property access.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>?` for the operand, or `Iterable<_>?`

diff --git a/tests/language/inference_update_3/if_null_assignment_property_test.dart b/tests/language/inference_update_3/if_null_assignment_property_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is an ordinary property access.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_static_property_test.dart b/tests/language/inference_update_3/if_null_assignment_static_property_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is a static property access.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_super_index_expression_test.dart b/tests/language/inference_update_3/if_null_assignment_super_index_expression_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is an index expression whose target is
 // `super`.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_super_property_test.dart b/tests/language/inference_update_3/if_null_assignment_super_property_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is a property of the superclass,
 // accessed through `super`.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_this_index_expression_test.dart b/tests/language/inference_update_3/if_null_assignment_this_index_expression_test.dart
@@ -7,8 +7,6 @@
 // using if-null assignments whose target is an index expression whose target is
 // `this`.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_assignment_top_level_property_test.dart b/tests/language/inference_update_3/if_null_assignment_top_level_property_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null assignments whose target is an access to a top level property.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tests/language/inference_update_3/if_null_test.dart b/tests/language/inference_update_3/if_null_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using if-null expressions.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `_` for the operand, if no type argument is

diff --git a/tests/language/inference_update_3/switch_expression_test.dart b/tests/language/inference_update_3/switch_expression_test.dart
@@ -6,8 +6,6 @@
 // https://github.com/dart-lang/language/issues/1618#issuecomment-1507241494,
 // using switch expressions.
 
-// SharedOptions=--enable-experiment=inference-update-3
-
 import '../static_type_helper.dart';
 
 /// Ensures a context type of `Iterable<T>` for the operand, or `Iterable<_>` if

diff --git a/tools/experimental_features.yaml b/tools/experimental_features.yaml
@@ -154,6 +154,7 @@ features:
         print('feature enabled');
       }
     help: "Better handling of conditional expressions, and switch expressions."
+    expired: true
 
   inline-class:
     enabledIn: '3.3.0'