From 8b0de38ef8cafa2ae3a4116f0a4e5a2f46c44f65 Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Wed, 17 Oct 2018 11:01:37 +0200 Subject: [PATCH] fix upcoming lint avoid_returning_null_for_void (#23190) --- dev/bots/run_command.dart | 2 +- dev/devicelab/bin/run.dart | 4 ++-- dev/devicelab/lib/framework/adb.dart | 1 - examples/flutter_gallery/lib/gallery/updater.dart | 2 +- packages/flutter/test/rendering/sliver_cache_test.dart | 2 +- packages/flutter/test/rendering/slivers_block_test.dart | 2 +- packages/flutter_test/lib/src/binding.dart | 1 - packages/flutter_tools/bin/fuchsia_asset_builder.dart | 1 - packages/flutter_tools/lib/src/cache.dart | 4 ++-- packages/flutter_tools/lib/src/crash_reporting.dart | 2 +- packages/flutter_tools/lib/src/ios/devices.dart | 4 +--- packages/flutter_tools/lib/src/run_cold.dart | 2 +- packages/flutter_tools/test/src/mocks.dart | 4 ++-- 13 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dev/bots/run_command.dart b/dev/bots/run_command.dart index 6b8f689160..c996aae31f 100644 --- a/dev/bots/run_command.dart +++ b/dev/bots/run_command.dart @@ -44,7 +44,7 @@ Future runCommand(String executable, List arguments, { final String relativeWorkingDir = path.relative(workingDirectory); if (skip) { printProgress('SKIPPING', relativeWorkingDir, commandDescription); - return null; + return; } printProgress('RUNNING', relativeWorkingDir, commandDescription); diff --git a/dev/devicelab/bin/run.dart b/dev/devicelab/bin/run.dart index 102a6dfa06..9ec6b077e3 100644 --- a/dev/devicelab/bin/run.dart +++ b/dev/devicelab/bin/run.dart @@ -28,7 +28,7 @@ Future main(List rawArgs) async { stderr.writeln('Usage:\n'); stderr.writeln(_argParser.usage); exitCode = 1; - return null; + return; } if (!args.wasParsed('task')) { @@ -50,7 +50,7 @@ Future main(List rawArgs) async { if (_taskNames.isEmpty) { stderr.writeln('Failed to find tasks to run based on supplied options.'); exitCode = 1; - return null; + return; } final bool silent = args['silent']; diff --git a/dev/devicelab/lib/framework/adb.dart b/dev/devicelab/lib/framework/adb.dart index 6afac2423f..04f2bd90c4 100644 --- a/dev/devicelab/lib/framework/adb.dart +++ b/dev/devicelab/lib/framework/adb.dart @@ -407,7 +407,6 @@ class IosDeviceDiscovery implements DeviceDiscovery { @override Future performPreflightTasks() async { // Currently we do not have preflight tasks for iOS. - return null; } } diff --git a/examples/flutter_gallery/lib/gallery/updater.dart b/examples/flutter_gallery/lib/gallery/updater.dart index 2c8e8f8ed4..c27a109b53 100644 --- a/examples/flutter_gallery/lib/gallery/updater.dart +++ b/examples/flutter_gallery/lib/gallery/updater.dart @@ -34,7 +34,7 @@ class UpdaterState extends State { // Only prompt once a day if (_lastUpdateCheck != null && DateTime.now().difference(_lastUpdateCheck) < const Duration(days: 1)) { - return null; // We already checked for updates recently + return; // We already checked for updates recently } _lastUpdateCheck = DateTime.now(); diff --git a/packages/flutter/test/rendering/sliver_cache_test.dart b/packages/flutter/test/rendering/sliver_cache_test.dart index a3f28c6e88..0bdef3c79e 100644 --- a/packages/flutter/test/rendering/sliver_cache_test.dart +++ b/packages/flutter/test/rendering/sliver_cache_test.dart @@ -931,7 +931,7 @@ class TestRenderSliverBoxChildManager extends RenderSliverBoxChildManager { @override void createChild(int index, { @required RenderBox after }) { if (index < 0 || index >= children.length) - return null; + return; try { _currentlyUpdatingChildIndex = index; _renderObject.insert(children[index], after: after); diff --git a/packages/flutter/test/rendering/slivers_block_test.dart b/packages/flutter/test/rendering/slivers_block_test.dart index a1ff80106f..2ce915401d 100644 --- a/packages/flutter/test/rendering/slivers_block_test.dart +++ b/packages/flutter/test/rendering/slivers_block_test.dart @@ -27,7 +27,7 @@ class TestRenderSliverBoxChildManager extends RenderSliverBoxChildManager { @override void createChild(int index, { @required RenderBox after }) { if (index < 0 || index >= children.length) - return null; + return; try { _currentlyUpdatingChildIndex = index; _renderObject.insert(children[index], after: after); diff --git a/packages/flutter_test/lib/src/binding.dart b/packages/flutter_test/lib/src/binding.dart index b865b0bd72..5decb8b126 100644 --- a/packages/flutter_test/lib/src/binding.dart +++ b/packages/flutter_test/lib/src/binding.dart @@ -568,7 +568,6 @@ abstract class TestWidgetsFlutterBinding extends BindingBase assert(inTest); asyncBarrier(); // When using AutomatedTestWidgetsFlutterBinding, this flushes the microtasks. - return null; } void _verifyInvariants() { diff --git a/packages/flutter_tools/bin/fuchsia_asset_builder.dart b/packages/flutter_tools/bin/fuchsia_asset_builder.dart index aa63d3d03b..fc131aebf4 100644 --- a/packages/flutter_tools/bin/fuchsia_asset_builder.dart +++ b/packages/flutter_tools/bin/fuchsia_asset_builder.dart @@ -40,7 +40,6 @@ Future writeFile(libfs.File outputFile, DevFSContent content) async { outputFile.createSync(recursive: true); final List data = await content.contentsAsBytes(); outputFile.writeAsBytesSync(data); - return null; } Future run(List args) async { diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 4010e1532d..cf8b1ea188 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -72,7 +72,7 @@ class Cache { /// calling [Cache.releaseLockEarly] once they are no longer touching the cache. static Future lock() async { if (!_lockEnabled) - return null; + return; assert(_lock == null); _lock = await fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')).open(mode: FileMode.write); bool locked = false; @@ -201,7 +201,7 @@ class Cache { Future updateAll() async { if (!_lockEnabled) - return null; + return; try { for (CachedArtifact artifact in _artifacts) { if (!artifact.isUpToDate()) diff --git a/packages/flutter_tools/lib/src/crash_reporting.dart b/packages/flutter_tools/lib/src/crash_reporting.dart index 39a8cb3066..ae1327f2d3 100644 --- a/packages/flutter_tools/lib/src/crash_reporting.dart +++ b/packages/flutter_tools/lib/src/crash_reporting.dart @@ -87,7 +87,7 @@ class CrashReportSender { }) async { try { if (_usage.suppressAnalytics) - return null; + return; printStatus('Sending crash report to Google.'); diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index da6ee620b8..8478aaa01f 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -579,7 +579,7 @@ class _IOSDevicePortForwarder extends DevicePortForwarder { Future unforward(ForwardedPort forwardedPort) async { if (!_forwardedPorts.remove(forwardedPort)) { // Not in list. Nothing to remove. - return null; + return; } printTrace('Unforwarding port $forwardedPort'); @@ -591,7 +591,5 @@ class _IOSDevicePortForwarder extends DevicePortForwarder { } else { printError('Forwarded port did not have a valid process'); } - - return null; } } diff --git a/packages/flutter_tools/lib/src/run_cold.dart b/packages/flutter_tools/lib/src/run_cold.dart index 32e415e2f9..ae5762a7fe 100644 --- a/packages/flutter_tools/lib/src/run_cold.dart +++ b/packages/flutter_tools/lib/src/run_cold.dart @@ -109,7 +109,7 @@ class ColdRunner extends ResidentRunner { } @override - Future handleTerminalCommand(String code) async => null; + Future handleTerminalCommand(String code) async { } @override Future cleanupAfterSignal() async { diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index a22872a495..e2b24d99bd 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -278,10 +278,10 @@ class MemoryIOSink implements IOSink { Future get done => close(); @override - Future close() async => null; + Future close() async { } @override - Future flush() async => null; + Future flush() async { } } /// A Stdio that collects stdout and supports simulated stdin.