Skip to content

Commit d352bc2

Browse files
lrhncommit-bot@chromium.org
authored andcommitted
Remove (most) uses of the "non-nullable" experiment flag.
Since the flag is now enabled by default, there should be no mention of it. There are still some uses in front_end/testcases that are not just removable (it also uses `no-non-nullable`). There migth be more uses that are not as easily found as grepping for `--enable-experiment Removes two VM tests where fixing them meant they were just duplicating the corresponding non *_2/ tests. Fixes #44941 TEST= Large number of tests chaged.=(no-)?non-nullable`. Change-Id: Ief755981ccde9a5482fcdf408c2929c74433a710 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/183688 Commit-Queue: Lasse R.H. Nielsen <[email protected]> Reviewed-by: Nate Bosch <[email protected]>
1 parent 2d27b34 commit d352bc2

File tree

119 files changed

+23
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+23
-314
lines changed

pkg/compiler/test/codegen/codegen_test_helper.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runTests(List<String> args, [int shardIndex]) {
3333
shards: 2,
3434
directory: 'data',
3535
skip: skip,
36-
options: ['--enable-experiment=non-nullable', Flags.soundNullSafety]);
36+
options: [Flags.soundNullSafety]);
3737
}
3838

3939
runTests2(List<String> args, [int shardIndex]) {

pkg/compiler/tool/modular_test_suite.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ class SourceToDillStep implements IOModularStep {
219219
.expand((m) => ['--input-linked', '${toUri(m, dillId)}'])),
220220
...(sources.expand((String uri) => ['--source', uri])),
221221
...(flags.expand((String flag) => ['--enable-experiment', flag])),
222-
'--enable-experiment=non-nullable',
223222
];
224223

225224
var result =

pkg/dartdev/test/commands/pub_test.dart

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,6 @@ void pub() {
7171
expect(result.stderr, result2.stderr);
7272
});
7373

74-
test('run --enable-experiment', () {
75-
p = project();
76-
p.file('bin/main.dart',
77-
"void main() { int? a; a = null; print('a is \$a.'); }");
78-
79-
// run 'pub get'
80-
p.runSync(['pub', 'get']);
81-
82-
var result = p.runSync(
83-
['pub', 'run', '--enable-experiment=no-non-nullable', 'main.dart']);
84-
85-
expect(result.exitCode, 254);
86-
expect(result.stdout, isEmpty);
87-
expect(
88-
result.stderr,
89-
contains('bin/main.dart:1:18: Error: This requires the null safety '
90-
'language feature, which requires language version of 2.12 or '
91-
'higher.\n'));
92-
});
93-
9474
test('failure', () {
9575
p = project(mainSrc: 'int get foo => 1;\n');
9676
var result = p.runSync(['pub', 'deps']);

pkg/dev_compiler/tool/check_nnbd_sdk.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,12 @@ main() {}
117117
var result = Process.runSync(dart.toFilePath(), [
118118
// The NNBD dart binaries / snapshots require this flag to be enabled at
119119
// VM level.
120-
if (analyzerSnapshot.contains('NNBD')) '--enable-experiment=non-nullable',
121120
analyzerSnapshot,
122121
'--dart-sdk=${sdkDir}',
123122
'--format',
124123
'machine',
125124
'--sdk-warnings',
126125
'--no-hints',
127-
'--enable-experiment',
128-
'non-nullable',
129126
emptyProgramUri.toFilePath()
130127
]);
131128

pkg/front_end/test/fasta/testing/suite.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,6 @@ class Run extends Step<ComponentResult, ComponentResult, FastaContext> {
788788
try {
789789
var args = <String>[];
790790
if (experimentalFlags[ExperimentalFlag.nonNullable] == true) {
791-
args.add("--enable-experiment=non-nullable");
792791
if (!context.weak) {
793792
args.add("--sound-null-safety");
794793
}

pkg/frontend_server/test/frontend_server_test.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,7 +1761,6 @@ class BarState extends State<FizzWidget> {
17611761
'--output-dill=${dillFile.path}',
17621762
'--packages=${package_config.path}',
17631763
'--target=dartdevc',
1764-
'--enable-experiment=non-nullable',
17651764
file.path,
17661765
];
17671766

@@ -1915,7 +1914,6 @@ class BarState extends State<FizzWidget> {
19151914
'--output-dill=${dillFile.path}',
19161915
'--target=dartdevc',
19171916
'--packages=${package_config.path}',
1918-
'--enable-experiment=non-nullable',
19191917
];
19201918

19211919
final StreamController<List<int>> streamController =
@@ -1996,7 +1994,6 @@ class BarState extends State<FizzWidget> {
19961994
'--target=dartdevc',
19971995
'--packages=${package_config.path}',
19981996
'--experimental-emit-debug-metadata',
1999-
'--enable-experiment=non-nullable',
20001997
];
20011998

20021999
final StreamController<List<int>> streamController =
@@ -2243,7 +2240,6 @@ class BarState extends State<FizzWidget> {
22432240
'--output-dill=${dillFile.path}',
22442241
'--target=dartdevc',
22452242
'--packages=${package_config.path}',
2246-
'--enable-experiment=non-nullable',
22472243
];
22482244

22492245
final StreamController<List<int>> streamController =
@@ -2362,7 +2358,6 @@ class BarState extends State<FizzWidget> {
23622358
'--output-dill=${dillFile.path}',
23632359
'--target=dartdevc',
23642360
'--packages=${package_config.path}',
2365-
'--enable-experiment=non-nullable'
23662361
];
23672362

23682363
final StreamController<List<int>> streamController =

runtime/bin/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ gen_snapshot_action("generate_snapshot_bin") {
496496
isolate_snapshot_instructions,
497497
]
498498
args = [
499-
"--enable-experiment=non-nullable",
500499
"--sound-null-safety",
501500
"--deterministic",
502501
"--snapshot_kind=" + dart_core_snapshot_kind,

runtime/tests/vm/dart/null_safety_autodetection_in_kernel_compiler_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ compileAndRunTest(String comment, String expectedOutput) async {
2929
await runGenKernelWithoutStandardOptions('BUILD DILL FILE', [
3030
"--platform",
3131
platformDill,
32-
'--enable-experiment=non-nullable',
3332
'--output=$testDillPath',
3433
testScriptPath,
3534
]);

runtime/tests/vm/dart/type_casts_with_null_safety_autodetection_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ runTest(String script, String output, String temp) async {
2222
// Do not add Platform.executableArguments into arguments to avoid passing
2323
// --sound-null-safety / --no-sound-null-safety arguments.
2424
final result = await runBinary("RUN $script", Platform.executable, [
25-
'--enable-experiment=non-nullable',
2625
'--deterministic',
2726
'--optimization-counter-threshold=10',
2827
'--packages=${Platform.packageConfig}',

runtime/tests/vm/dart_2/null_safety_autodetection_in_kernel_compiler_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ compileAndRunTest(String comment, String expectedOutput) async {
2929
await runGenKernelWithoutStandardOptions('BUILD DILL FILE', [
3030
"--platform",
3131
platformDill,
32-
'--enable-experiment=non-nullable',
3332
'--output=$testDillPath',
3433
testScriptPath,
3534
]);

0 commit comments

Comments
 (0)