Tighten up a bunch of types in test.dart.

tools/testing/dart/compiler_configuration.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library compiler_configuration;
 
 import 'dart:io' show Platform;
 
 import 'runtime_configuration.dart' show RuntimeConfiguration;
 import 'runtime_configuration.dart' show DartPrecompiledAdbRuntimeConfiguration;
@@ skipping 148 matching lines @@
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
       List<String> arguments,
       Map<String, String> environmentOverrides) {
     return new CommandArtifact([], null, null);
   }
 
-  List<String> computeCompilerArguments(vmOptions, sharedOptions, args) {
-    return new List<String>()..addAll(sharedOptions)..addAll(args);
+  List<String> computeCompilerArguments(
+      List<String> vmOptions, List<String> sharedOptions, List<String> args) {
+    return sharedOptions.toList()..addAll(args);
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
-    return <String>[artifact.filename];
+    return [artifact.filename];
   }
 }
 
 /// The "none" compiler.
 class NoneCompilerConfiguration extends CompilerConfiguration {
   final bool hotReload;
   final bool hotReloadRollback;
   final bool useDFE;
 
   NoneCompilerConfiguration(
@@ skipping 169 matching lines @@
 
 class ComposedCompilerConfiguration extends CompilerConfiguration {
   final List<PipelineCommand> pipelineCommands;
 
   ComposedCompilerConfiguration(this.pipelineCommands) : super._subclass();
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
-      List globalArguments,
+      List<String> globalArguments,
       Map<String, String> environmentOverrides) {
     List<Command> allCommands = [];
 
     // The first compilation command is as usual.
     var arguments = pipelineCommands[0].extractArguments(globalArguments, null);
     CommandArtifact artifact = pipelineCommands[0]
         .compilerConfiguration
         .computeCompilationArtifact(
             buildDir, tempDir, commandBuilder, arguments, environmentOverrides);
     allCommands.addAll(artifact.commands);
@@ skipping 43 matching lines @@
   static ComposedCompilerConfiguration createDartKPConfiguration(
       {bool isChecked,
       bool isHostChecked,
       String arch,
       bool useBlobs,
       bool isAndroid,
       bool useSdk,
       bool verify,
       bool strong,
       bool treeShake}) {
-    var nested = [];
+    return new ComposedCompilerConfiguration([
+      // Compile with dartk.
+      new PipelineCommand.runWithGlobalArguments(new DartKCompilerConfiguration(
+          isChecked: isChecked,
+          isHostChecked: isHostChecked,
+          useSdk: useSdk,
+          verify: verify,
+          strong: strong,
+          treeShake: treeShake)),
 
-    // Compile with dartk.
-    nested.add(new PipelineCommand.runWithGlobalArguments(
-        new DartKCompilerConfiguration(
-            isChecked: isChecked,
-            isHostChecked: isHostChecked,
-            useSdk: useSdk,
-            verify: verify,
-            strong: strong,
-            treeShake: treeShake)));
-
-    // Run the normal precompiler.
-    nested.add(new PipelineCommand.runWithPreviousKernelOutput(
-        new PrecompilerCompilerConfiguration(
-            isChecked: isChecked,
-            arch: arch,
-            useBlobs: useBlobs,
-            isAndroid: isAndroid)));
-
-    return new ComposedCompilerConfiguration(nested);
+      // Run the normal precompiler.
+      new PipelineCommand.runWithPreviousKernelOutput(
+          new PrecompilerCompilerConfiguration(
+              isChecked: isChecked,
+              arch: arch,
+              useBlobs: useBlobs,
+              isAndroid: isAndroid))
+    ]);
   }
 
   static ComposedCompilerConfiguration createDartKConfiguration(
       {bool isChecked,
       bool isHostChecked,
       bool useSdk,
       bool verify,
       bool strong,
       bool treeShake}) {
-    var nested = [];
-
-    // Compile with dartk.
-    nested.add(new PipelineCommand.runWithGlobalArguments(
-        new DartKCompilerConfiguration(
-            isChecked: isChecked,
-            isHostChecked: isHostChecked,
-            useSdk: useSdk,
-            verify: verify,
-            strong: strong,
-            treeShake: treeShake)));
-
-    return new ComposedCompilerConfiguration(nested);
+    return new ComposedCompilerConfiguration([
+      // Compile with dartk.
+      new PipelineCommand.runWithGlobalArguments(new DartKCompilerConfiguration(
+          isChecked: isChecked,
+          isHostChecked: isHostChecked,
+          useSdk: useSdk,
+          verify: verify,
+          strong: strong,
+          treeShake: treeShake))
+    ]);
   }
 }
 
 /// Common configuration for dart2js-based tools, such as, dart2js
 class Dart2xCompilerConfiguration extends CompilerConfiguration {
   final String moniker;
   static Map<String, List<Uri>> _bootstrapDependenciesCache =
       new Map<String, List<Uri>>();
 
   Dart2xCompilerConfiguration(this.moniker,
@@ skipping 17 matching lines @@
         prefix = '$buildDir/dart-sdk/bin';
       }
       return '$prefix/dart2js$suffix';
     }
   }
 
   CompilationCommand computeCompilationCommand(
       String outputFileName,
       String buildDir,
       CommandBuilder commandBuilder,
-      List arguments,
+      List<String> arguments,
       Map<String, String> environmentOverrides) {
-    arguments = new List.from(arguments);
+    arguments = arguments.toList();
     arguments.add('--out=$outputFileName');
 
     return commandBuilder.getCompilationCommand(
         moniker,
         outputFileName,
         !useSdk,
         bootstrapDependencies(buildDir),
         computeCompilerPath(buildDir),
         arguments,
         environmentOverrides);
@@ skipping 43 matching lines @@
     if (isDebug) multiplier *= 4;
     if (isChecked) multiplier *= 2;
     if (isHostChecked) multiplier *= 16;
     return multiplier;
   }
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
-      List arguments,
+      List<String> arguments,
       Map<String, String> environmentOverrides) {
-    List compilerArguments = new List.from(arguments)
-      ..addAll(extraDart2jsOptions);
-    return new CommandArtifact(<Command>[
+    var compilerArguments = arguments.toList()..addAll(extraDart2jsOptions);
+    return new CommandArtifact([
       this.computeCompilationCommand('$tempDir/out.js', buildDir,
           CommandBuilder.instance, compilerArguments, environmentOverrides)
     ], '$tempDir/out.js', 'application/javascript');
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
@@ skipping 29 matching lines @@
     int multiplier = 2;
     if (isDebug) multiplier *= 4;
     if (isChecked) multiplier *= 2;
     return multiplier;
   }
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
-      List arguments,
+      List<String> arguments,
       Map<String, String> environmentOverrides) {
     var commands = new List<Command>();
     commands.add(this.computeCompilationCommand(tempDir, buildDir,
         CommandBuilder.instance, arguments, environmentOverrides));
     if (!useBlobs) {
       commands.add(this.computeAssembleCommand(tempDir, buildDir,
           CommandBuilder.instance, arguments, environmentOverrides));
       commands.add(this.computeRemoveAssemblyCommand(tempDir, buildDir,
           CommandBuilder.instance, arguments, environmentOverrides));
     }
     return new CommandArtifact(
         commands, '$tempDir', 'application/dart-precompiled');
   }
 
   CompilationCommand computeCompilationCommand(
       String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
-      List arguments,
+      List<String> arguments,
       Map<String, String> environmentOverrides) {
-    var exec;
+    String exec;
     if (isAndroid) {
       if (arch == "arm") {
         exec = "$buildDir/clang_x86/dart_bootstrap";
       } else if (arch == "arm64") {
         exec = "$buildDir/clang_x64/dart_bootstrap";
       }
     } else {
       exec = "$buildDir/dart_bootstrap";
     }
-    var args = new List();
+    var args = <String>[];
     if (useDFE) {
       args.add('--dfe=utils/kernel-service/kernel-service.dart');
       args.add('--platform=${buildDir}/patched_sdk/platform.dill');
     }
     args.add("--snapshot-kind=app-aot");
     if (useBlobs) {
       args.add("--snapshot=$tempDir/out.aotsnapshot");
       args.add("--use-blobs");
     } else {
       args.add("--snapshot=$tempDir/out.S");
     }
     if (isAndroid && arch == 'arm') {
       args.add('--no-sim-use-hardfp');
     }
     args.addAll(arguments);
 
     return commandBuilder.getCompilationCommand('precompiler', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
   CompilationCommand computeAssembleCommand(
       String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
       List arguments,
       Map<String, String> environmentOverrides) {
-    var cc, shared, ld_flags;
+    String cc, shared, ld_flags;
     if (isAndroid) {
       var ndk = "third_party/android_tools/ndk";
-      var triple;
+      String triple;
       if (arch == "arm") {
         triple = "arm-linux-androideabi";
       } else if (arch == "arm64") {
         triple = "aarch64-linux-android";
       }
-      var host;
+      String host;
       if (Platform.isLinux) {
         host = "linux";
       } else if (Platform.isMacOS) {
         host = "darwin";
       }
       cc = "$ndk/toolchains/$triple-4.9/prebuilt/$host-x86_64/bin/$triple-gcc";
       shared = '-shared';
     } else if (Platform.isLinux) {
       cc = 'gcc';
       shared = '-shared';
     } else if (Platform.isMacOS) {
       cc = 'clang';
       shared = '-dynamiclib';
       // Tell Mac linker to give up generating eh_frame from dwarf.
       ld_flags = '-Wl,-no_compact_unwind';
     } else {
       throw "Platform not supported: ${Platform.operatingSystem}";
     }
 
-    var cc_flags;
+    String cc_flags;
     if (arch == 'x64') {
       cc_flags = "-m64";
     } else if (arch == 'simarm64') {
       cc_flags = "-m64";
     } else if (arch == 'ia32') {
       cc_flags = "-m32";
     } else if (arch == 'simarm') {
       cc_flags = "-m32";
     } else if (arch == 'simmips') {
       cc_flags = "-m32";
     } else if (arch == 'arm') {
       cc_flags = null;
     } else if (arch == 'arm64') {
       cc_flags = null;
     } else if (arch == 'mips') {
       cc_flags = "-EL";
     } else {
       throw "Architecture not supported: $arch";
     }
 
     var exec = cc;
-    var args = [];
+    var args = <String>[];
     if (cc_flags != null) args.add(cc_flags);
     if (ld_flags != null) args.add(ld_flags);
     args.add(shared);
     args.add('-nostdlib');
     args.add('-o');
     args.add('$tempDir/out.aotsnapshot');
     args.add('$tempDir/out.S');
 
     return commandBuilder.getCompilationCommand('assemble', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
@@ skipping 14 matching lines @@
         'remove_assembly',
         tempDir,
         !useSdk,
         bootstrapDependencies(buildDir),
         exec,
         args,
         environmentOverrides);
   }
 
   List<String> filterVmOptions(List<String> vmOptions) {
-    var filtered = new List.from(vmOptions);
+    var filtered = vmOptions.toList();
     filtered.removeWhere(
         (option) => option.startsWith("--optimization-counter-threshold"));
     filtered.removeWhere(
         (option) => option.startsWith("--optimization_counter_threshold"));
     return filtered;
   }
 
   List<String> computeCompilerArguments(
       vmOptions, sharedOptions, originalArguments) {
     List<String> args = [];
@@ skipping 45 matching lines @@
     int multiplier = 1;
     if (isDebug) multiplier *= 2;
     if (isChecked) multiplier *= 2;
     return multiplier;
   }
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
-      List arguments,
+      List<String> arguments,
       Map<String, String> environmentOverrides) {
     var snapshot = "$tempDir/out.jitsnapshot";
     return new CommandArtifact(<Command>[
       this.computeCompilationCommand(tempDir, buildDir, CommandBuilder.instance,
           arguments, environmentOverrides)
     ], snapshot, 'application/dart-snapshot');
   }
 
   CompilationCommand computeCompilationCommand(
       String tempDir,
       String buildDir,
       CommandBuilder commandBuilder,
-      List arguments,
+      List<String> arguments,
       Map<String, String> environmentOverrides) {
     var exec = "$buildDir/dart";
-    var args = new List();
     var snapshot = "$tempDir/out.jitsnapshot";
-    args.add("--snapshot=$snapshot");
-    args.add("--snapshot-kind=app-jit");
+    var args = ["--snapshot=$snapshot", "--snapshot-kind=app-jit"];
     args.addAll(arguments);
 
     return commandBuilder.getCompilationCommand('app_jit', tempDir, !useSdk,
         bootstrapDependencies(buildDir), exec, args, environmentOverrides);
   }
 
   List<String> computeCompilerArguments(
       vmOptions, sharedOptions, originalArguments) {
-    List<String> args = [];
+    var args = <String>[];
     if (isChecked) {
       args.add('--enable_asserts');
       args.add('--enable_type_checks');
     }
     return args
       ..addAll(vmOptions)
       ..addAll(sharedOptions)
       ..addAll(originalArguments);
   }
 
@@ skipping 53 matching lines @@
     if (useSdk) {
       prefix = '$buildDir/dart-sdk/bin';
     }
     return '$prefix/dartanalyzer$suffix';
   }
 
   CommandArtifact computeCompilationArtifact(
       String buildDir,
       String tempDir,
       CommandBuilder commandBuilder,
-      List arguments,
+      List<String> arguments,
       Map<String, String> environmentOverrides) {
-    arguments = new List.from(arguments);
+    arguments = arguments.toList();
     if (isChecked || isStrong) {
       arguments.add('--enable_type_checks');
     }
     if (isStrong) {
       arguments.add('--strong');
     }
-    return new CommandArtifact(<Command>[
+    return new CommandArtifact([
       commandBuilder.getAnalysisCommand('dart2analyzer',
           computeCompilerPath(buildDir), arguments, environmentOverrides,
           flavor: 'dart2analyzer')
     ], null, null); // Since this is not a real compilation, no artifacts are
     // produced.
   }
 
   List<String> computeRuntimeArguments(
       RuntimeConfiguration runtimeConfiguration,
       String buildDir,
       TestInformation info,
       List<String> vmOptions,
       List<String> sharedOptions,
       List<String> originalArguments,
       CommandArtifact artifact) {
     return <String>[];
   }
 }