Skip to content

Commit c6ced84

Browse files
authored
Remove custom unawaited, prefer dart:async version (#103212)
1 parent 2427d4f commit c6ced84

Some content is hidden

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

54 files changed

+15
-74
lines changed

dev/devicelab/bin/tasks/flutter_attach_test_fuchsia.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:convert';
77
import 'dart:io';
88
import 'dart:math';
99

10-
import 'package:flutter_devicelab/common.dart';
1110
import 'package:flutter_devicelab/framework/devices.dart';
1211
import 'package:flutter_devicelab/framework/framework.dart';
1312
import 'package:flutter_devicelab/framework/task_result.dart';

dev/devicelab/bin/tasks/module_test_ios.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
56
import 'dart:convert';
67
import 'dart:io';
78
import 'dart:typed_data';
89

9-
import 'package:flutter_devicelab/common.dart';
1010
import 'package:flutter_devicelab/framework/framework.dart';
1111
import 'package:flutter_devicelab/framework/host_agent.dart';
1212
import 'package:flutter_devicelab/framework/ios.dart';

dev/devicelab/bin/tasks/routing_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66
import 'dart:convert';
77
import 'dart:io';
88

9-
import 'package:flutter_devicelab/common.dart';
109
import 'package:flutter_devicelab/framework/devices.dart';
1110
import 'package:flutter_devicelab/framework/framework.dart';
1211
import 'package:flutter_devicelab/framework/task_result.dart';

dev/devicelab/bin/tasks/run_release_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66
import 'dart:convert';
77
import 'dart:io';
88

9-
import 'package:flutter_devicelab/common.dart';
109
import 'package:flutter_devicelab/framework/devices.dart';
1110
import 'package:flutter_devicelab/framework/framework.dart';
1211
import 'package:flutter_devicelab/framework/task_result.dart';

dev/devicelab/bin/tasks/run_release_test_macos.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66
import 'dart:convert';
77
import 'dart:io';
88

9-
import 'package:flutter_devicelab/common.dart';
109
import 'package:flutter_devicelab/framework/devices.dart';
1110
import 'package:flutter_devicelab/framework/framework.dart';
1211
import 'package:flutter_devicelab/framework/task_result.dart';

dev/devicelab/bin/tasks/service_extensions_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66
import 'dart:convert';
77
import 'dart:io';
88

9-
import 'package:flutter_devicelab/common.dart';
109
import 'package:flutter_devicelab/framework/devices.dart';
1110
import 'package:flutter_devicelab/framework/framework.dart';
1211
import 'package:flutter_devicelab/framework/task_result.dart';

dev/devicelab/bin/test_runner.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
56
import 'dart:io';
67

78
import 'package:args/command_runner.dart';
89

910
import 'package:flutter_devicelab/command/test.dart';
1011
import 'package:flutter_devicelab/command/upload_results.dart';
11-
import 'package:flutter_devicelab/common.dart';
1212

1313
final CommandRunner<void> runner =
1414
CommandRunner<void>('devicelab_runner', 'DeviceLab test runner for recording test results')

dev/devicelab/lib/common.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

dev/devicelab/lib/framework/browser.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import 'dart:math' as math;
1010
import 'package:path/path.dart' as path;
1111
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1212

13-
import '../common.dart';
14-
1513
/// The number of samples used to extract metrics, such as noise, means,
1614
/// max/min values.
1715
///

dev/devicelab/lib/framework/devices.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'dart:math' as math;
99

1010
import 'package:path/path.dart' as path;
1111

12-
import '../common.dart';
1312
import 'utils.dart';
1413

1514
const String DeviceIdEnvName = 'FLUTTER_DEVICELAB_DEVICEID';

dev/devicelab/lib/framework/runner.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'dart:io';
99
import 'package:meta/meta.dart';
1010
import 'package:vm_service/vm_service.dart';
1111

12-
import '../common.dart';
1312
import 'cocoon.dart';
1413
import 'devices.dart';
1514
import 'task_result.dart';

dev/devicelab/lib/framework/utils.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import 'package:path/path.dart' as path;
1111
import 'package:process/process.dart';
1212
import 'package:stack_trace/stack_trace.dart';
1313

14-
import '../common.dart';
1514
import 'devices.dart';
1615
import 'host_agent.dart';
1716
import 'task_result.dart';

dev/devicelab/lib/tasks/dart_plugin_registry_tests.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'dart:io';
88

99
import 'package:path/path.dart' as path;
1010

11-
import '../common.dart';
1211
import '../framework/framework.dart';
1312
import '../framework/task_result.dart';
1413
import '../framework/utils.dart';

dev/devicelab/lib/tasks/perf_tests.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'dart:math' as math;
1010
import 'package:meta/meta.dart';
1111
import 'package:path/path.dart' as path;
1212

13-
import '../common.dart';
1413
import '../framework/devices.dart';
1514
import '../framework/framework.dart';
1615
import '../framework/host_agent.dart';

dev/devicelab/lib/tasks/web_benchmarks.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import 'package:shelf/shelf.dart';
1212
import 'package:shelf/shelf_io.dart' as shelf_io;
1313
import 'package:shelf_static/shelf_static.dart';
1414

15-
import '../common.dart';
1615
import '../framework/browser.dart';
1716
import '../framework/task_result.dart';
1817
import '../framework/utils.dart';

packages/flutter_tools/lib/src/android/android_device.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:process/process.dart';
1010
import '../android/android_builder.dart';
1111
import '../android/android_sdk.dart';
1212
import '../application_package.dart';
13-
import '../base/common.dart' show throwToolExit, unawaited;
13+
import '../base/common.dart' show throwToolExit;
1414
import '../base/file_system.dart';
1515
import '../base/io.dart';
1616
import '../base/logger.dart';

packages/flutter_tools/lib/src/android/android_emulator.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:process/process.dart';
99

1010
import '../android/android_sdk.dart';
1111
import '../android/android_workflow.dart';
12-
import '../base/common.dart';
1312
import '../base/file_system.dart';
1413
import '../base/io.dart';
1514
import '../base/logger.dart';

packages/flutter_tools/lib/src/android/android_workflow.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
6+
57
import 'package:process/process.dart';
68

79
import '../base/common.dart';

packages/flutter_tools/lib/src/base/common.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,3 @@ class ToolExit implements Exception {
2323
@override
2424
String toString() => 'Exception: $message'; // TODO(ianh): Really this should say "Error".
2525
}
26-
27-
/// Indicates to the linter that the given future is intentionally not awaited.
28-
///
29-
/// Has the same functionality as `unawaited` from `package:pedantic`.
30-
///
31-
/// In an async context, it is normally expected than all Futures are awaited,
32-
/// and that is the basis of the lint unawaited_futures which is turned on for
33-
/// the flutter_tools package. However, there are times where one or more
34-
/// futures are intentionally not awaited. This function may be used to ignore a
35-
/// particular future. It silences the unawaited_futures lint.
36-
void unawaited(Future<void>? future) { }

packages/flutter_tools/lib/src/base/process.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:async';
77
import 'package:process/process.dart';
88

99
import '../convert.dart';
10-
import 'common.dart';
1110
import 'io.dart';
1211
import 'logger.dart';
1312

packages/flutter_tools/lib/src/commands/update_packages.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
56
import 'dart:collection';
67

78
import 'package:meta/meta.dart';

packages/flutter_tools/lib/src/dart/analysis.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:math' as math;
77

88
import 'package:process/process.dart';
99

10-
import '../base/common.dart';
1110
import '../base/file_system.dart';
1211
import '../base/io.dart';
1312
import '../base/logger.dart';

packages/flutter_tools/lib/src/dart/pub.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
6+
57
import 'package:package_config/package_config.dart';
68
import 'package:process/process.dart';
79

packages/flutter_tools/lib/src/desktop_device.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:async';
77
import 'package:process/process.dart';
88

99
import 'application_package.dart';
10-
import 'base/common.dart';
1110
import 'base/file_system.dart';
1211
import 'base/io.dart';
1312
import 'base/logger.dart';

packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
6+
57
import '../base/common.dart';
68
import '../base/file_system.dart';
79
import '../base/io.dart';

packages/flutter_tools/lib/src/ios/code_signing.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
6+
57
import 'package:process/process.dart';
68

79
import '../base/common.dart';

packages/flutter_tools/lib/src/ios/devices.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'package:meta/meta.dart';
88
import 'package:process/process.dart';
99
import 'package:vm_service/vm_service.dart' as vm_service;
1010

11-
import '../base/common.dart';
1211
import '../base/file_system.dart';
1312
import '../base/io.dart';
1413
import '../base/logger.dart';

packages/flutter_tools/lib/src/ios/ios_deploy.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'package:meta/meta.dart';
88
import 'package:process/process.dart';
99

1010
import '../artifacts.dart';
11-
import '../base/common.dart';
1211
import '../base/file_system.dart';
1312
import '../base/io.dart';
1413
import '../base/logger.dart';

packages/flutter_tools/lib/src/ios/mac.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'dart:async';
6+
57
import 'package:meta/meta.dart';
68
import 'package:process/process.dart';
79

810
import '../artifacts.dart';
9-
import '../base/common.dart';
1011
import '../base/file_system.dart';
1112
import '../base/io.dart';
1213
import '../base/logger.dart';

packages/flutter_tools/lib/src/macos/xcdevice.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'dart:async';
77
import 'package:process/process.dart';
88

99
import '../artifacts.dart';
10-
import '../base/common.dart';
1110
import '../base/io.dart';
1211
import '../base/logger.dart';
1312
import '../base/platform.dart';

packages/flutter_tools/lib/src/proxied_devices/devices.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'dart:typed_data';
88
import 'package:meta/meta.dart';
99

1010
import '../application_package.dart';
11-
import '../base/common.dart';
1211
import '../base/file_system.dart';
1312
import '../base/io.dart';
1413
import '../base/logger.dart';

packages/flutter_tools/lib/src/resident_devtools_handler.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'dart:async';
99
import 'package:browser_launcher/browser_launcher.dart';
1010
import 'package:meta/meta.dart';
1111

12-
import 'base/common.dart';
1312
import 'base/logger.dart';
1413
import 'build_info.dart';
1514
import 'resident_runner.dart';

packages/flutter_tools/lib/src/run_cold.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'dart:async';
88

99
import 'package:meta/meta.dart';
1010

11-
import 'base/common.dart';
1211
import 'base/file_system.dart';
1312
import 'base/logger.dart';
1413
import 'build_info.dart';

packages/flutter_tools/lib/src/run_hot.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import 'package:package_config/package_config.dart';
1111
import 'package:pool/pool.dart';
1212
import 'package:vm_service/vm_service.dart' as vm_service;
1313

14-
import 'base/common.dart';
1514
import 'base/context.dart';
1615
import 'base/file_system.dart';
1716
import 'base/logger.dart';

packages/flutter_tools/lib/src/test/flutter_tester_device.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import 'package:meta/meta.dart';
1212
import 'package:process/process.dart';
1313
import 'package:stream_channel/stream_channel.dart';
1414

15-
import '../base/common.dart';
1615
import '../base/file_system.dart';
1716
import '../base/io.dart';
1817
import '../base/logger.dart';

packages/flutter_tools/lib/src/test/flutter_web_goldens.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'dart:typed_data';
1010
import 'package:meta/meta.dart';
1111
import 'package:process/process.dart';
1212

13-
import '../base/common.dart';
1413
import '../base/file_system.dart';
1514
import '../base/io.dart';
1615
import '../base/logger.dart';

packages/flutter_tools/lib/src/test/integration_test_device.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'package:stream_channel/stream_channel.dart';
88
import 'package:vm_service/vm_service.dart' as vm_service;
99

1010
import '../application_package.dart';
11-
import '../base/common.dart';
1211
import '../build_info.dart';
1312
import '../device.dart';
1413
import '../globals.dart' as globals;

packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'dart:async';
99
import 'package:fake_async/fake_async.dart';
1010
import 'package:file/memory.dart';
1111
import 'package:flutter_tools/src/artifacts.dart';
12-
import 'package:flutter_tools/src/base/common.dart';
1312
import 'package:flutter_tools/src/base/file_system.dart';
1413
import 'package:flutter_tools/src/base/io.dart';
1514
import 'package:flutter_tools/src/base/logger.dart';

packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:file/src/interface/file.dart';
1313
import 'package:flutter_tools/src/android/android_device.dart';
1414
import 'package:flutter_tools/src/android/android_workflow.dart';
1515
import 'package:flutter_tools/src/application_package.dart';
16-
import 'package:flutter_tools/src/base/common.dart';
1716
import 'package:flutter_tools/src/base/logger.dart';
1817
import 'package:flutter_tools/src/base/utils.dart';
1918
import 'package:flutter_tools/src/build_info.dart';

packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import 'package:fake_async/fake_async.dart';
1717
import 'package:file/memory.dart';
1818
import 'package:flutter_tools/src/android/android_studio_validator.dart';
1919
import 'package:flutter_tools/src/android/android_workflow.dart';
20-
import 'package:flutter_tools/src/base/common.dart';
2120
import 'package:flutter_tools/src/base/file_system.dart';
2221
import 'package:flutter_tools/src/base/logger.dart';
2322
import 'package:flutter_tools/src/base/platform.dart';

packages/flutter_tools/test/commands.shard/hermetic/proxied_devices_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'dart:async';
99
import 'package:file/memory.dart';
1010
import 'package:flutter_tools/src/android/android_device.dart';
1111
import 'package:flutter_tools/src/application_package.dart';
12-
import 'package:flutter_tools/src/base/common.dart';
1312
import 'package:flutter_tools/src/base/file_system.dart';
1413
import 'package:flutter_tools/src/base/logger.dart';
1514
import 'package:flutter_tools/src/build_info.dart';

packages/flutter_tools/test/general.shard/base/async_guard_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66

77
import 'package:fake_async/fake_async.dart';
88
import 'package:flutter_tools/src/base/async_guard.dart';
9-
import 'package:flutter_tools/src/base/common.dart';
109

1110
import '../../src/common.dart';
1211

packages/flutter_tools/test/general.shard/compile_expression_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'dart:async';
66

77
import 'package:file/memory.dart';
88
import 'package:flutter_tools/src/artifacts.dart';
9-
import 'package:flutter_tools/src/base/common.dart';
109
import 'package:flutter_tools/src/base/io.dart';
1110
import 'package:flutter_tools/src/base/logger.dart';
1211
import 'package:flutter_tools/src/base/platform.dart';

packages/flutter_tools/test/general.shard/daemon_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import 'dart:async';
66
import 'dart:typed_data';
77

8-
import 'package:flutter_tools/src/base/common.dart';
98
import 'package:flutter_tools/src/base/io.dart';
109
import 'package:flutter_tools/src/base/logger.dart';
1110
import 'package:flutter_tools/src/convert.dart';

packages/flutter_tools/test/general.shard/ios/devices_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'dart:io' as io;
88
import 'package:file/file.dart';
99
import 'package:file/memory.dart';
1010
import 'package:flutter_tools/src/artifacts.dart';
11-
import 'package:flutter_tools/src/base/common.dart';
1211
import 'package:flutter_tools/src/base/file_system.dart';
1312
import 'package:flutter_tools/src/base/io.dart';
1413
import 'package:flutter_tools/src/base/logger.dart';

0 commit comments

Comments
 (0)