Use spread syntax instead of add (#3296)

dart-lang · Jan 14, 2023 · 263ea61 · 263ea61
1 parent 820b5ba
commit 263ea61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/src/generator/empty_generator.dart b/lib/src/generator/empty_generator.dart
@@ -14,8 +14,10 @@ class EmptyGenerator implements Generator {
   @override
   Future<void> generate(PackageGraph packageGraph) {
     logProgress(packageGraph.defaultPackage.documentationAsHtml);
-    for (var package in {packageGraph.defaultPackage}
-      ..addAll(packageGraph.localPackages)) {
+    for (var package in {
+      packageGraph.defaultPackage,
+      ...packageGraph.localPackages
+    }) {
       for (var category in filterNonDocumented(package.categories)) {
         logProgress(category.documentationAsHtml);
       }

diff --git a/testing/test_package/bin/drill.dart b/testing/test_package/bin/drill.dart
@@ -38,7 +38,7 @@ void main(List<String> argList) {
     'INVOCATION_INDEX',
     'PACKAGE_INVOCATION_INDEX',
   ]);
-  Map<String, String> env = <String, String>{}..addAll(Platform.environment);
+  Map<String, String> env = <String, String>{...Platform.environment};
   env.removeWhere((String key, String value) => !variableNames.contains(key));
   env.updateAll(
       (key, value) => inputFileRegExp.hasMatch(value) ? '<INPUT_FILE>' : value);

diff --git a/tool/subprocess_launcher.dart b/tool/subprocess_launcher.dart
@@ -175,9 +175,7 @@ class SubprocessLauncher {
       Map<String, String>? environment,
       bool includeParentEnvironment = true,
       void Function(String)? perLine}) async {
-    environment = {}
-      ..addAll(environmentDefaults)
-      ..addAll(environment ?? {});
+    environment = {...environmentDefaults, ...?environment};
     var jsonObjects = <Map<String, Object?>>[];
 
     /// Allow us to pretend we didn't pass the JSON flag in to dartdoc by