Tighten types in test.dart even more.

tools/testing/dart/vendored_pkg/args/args.dart

 // Copyright (c) 2013, 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.
 
 /**
  * This library lets you define parsers for parsing raw command-line arguments
  * into a set of options and values using [GNU][] and [POSIX][] style options.
  *
  * ## Defining options ##
  *
@@ skipping 259 matching lines @@
    *
    * * There is already an option with name [name].
    * * There is already an option using abbreviation [abbr].
    */
   void addOption(String name,
       {String abbr,
       String help,
       List<String> allowed,
       Map<String, String> allowedHelp,
       String defaultsTo,
-      void callback(value),
+      void callback(dynamic value),
       bool allowMultiple: false}) {
     _addOption(name, abbr, help, allowed, allowedHelp, defaultsTo, callback,
         isFlag: false, allowMultiple: allowMultiple);
   }
 
-  void _addOption(String name, String abbr, String help, List<String> allowed,
-      Map<String, String> allowedHelp, defaultsTo, void callback(value),
-      {bool isFlag, bool negatable: false, bool allowMultiple: false}) {
+  void _addOption(
+      String name,
+      String abbr,
+      String help,
+      List<String> allowed,
+      Map<String, String> allowedHelp,
+      dynamic defaultsTo,
+      void callback(dynamic value),
+      {bool isFlag,
+      bool negatable: false,
+      bool allowMultiple: false}) {
     // Make sure the name isn't in use.
     if (options.containsKey(name)) {
       throw new ArgumentError('Duplicate option "$name".');
     }
 
     // Make sure the abbreviation isn't too long or in use.
     if (abbr != null) {
       if (abbr.length > 1) {
         throw new ArgumentError(
             'Abbreviation "$abbr" is longer than one character.');
@@ skipping 21 matching lines @@
   /**
    * Generates a string displaying usage information for the defined options.
    * This is basically the help text shown on the command line.
    */
   String getUsage() => new Usage(this).generate();
 
   /**
    * Get the default value for an option. Useful after parsing to test
    * if the user specified something other than the default.
    */
-  getDefault(String option) {
+  dynamic getDefault(String option) {
     if (!options.containsKey(option)) {
       throw new ArgumentError('No option named $option');
     }
     return options[option].defaultValue;
   }
 
   /**
    * Finds the option whose abbreviation is [abbr], or `null` if no option has
    * that abbreviation.
    */
   Option findByAbbreviation(String abbr) {
     return options.values.firstWhere((option) => option.abbreviation == abbr,
         orElse: () => null);
   }
 }
 
 /**
  * A command-line option. Includes both flags and options which take a value.
  */
 class Option {
   final String name;
   final String abbreviation;
   final List allowed;
-  final defaultValue;
+  final dynamic defaultValue;
   final Function callback;
   final String help;
   final Map<String, String> allowedHelp;
   final bool isFlag;
   final bool negatable;
   final bool allowMultiple;
 
   Option(this.name, this.abbreviation, this.help, this.allowed,
       this.allowedHelp, this.defaultValue, this.callback,
       {this.isFlag, this.negatable, this.allowMultiple: false});
 }
 
 /**
  * The results of parsing a series of command line arguments using
  * [ArgParser.parse()]. Includes the parsed options and any remaining unparsed
  * command line arguments.
  */
 class ArgResults {
-  final Map _options;
+  final Map<String, dynamic> _options;
 
   /**
    * If these are the results for parsing a command's options, this will be
    * the name of the command. For top-level results, this returns `null`.
    */
   final String name;
 
   /**
    * The command that was selected, or `null` if none was. This will contain
    * the options that were selected for that command.
    */
   final ArgResults command;
 
   /**
    * The remaining command-line arguments that were not parsed as options or
    * flags. If `--` was used to separate the options from the remaining
    * arguments, it will not be included in this list.
    */
   final List<String> rest;
 
   /** Creates a new [ArgResults]. */
   ArgResults(this._options, this.name, this.command, this.rest);
 
   /** Gets the parsed command-line option named [name]. */
-  operator [](String name) {
+  dynamic operator [](String name) {
     if (!_options.containsKey(name)) {
       throw new ArgumentError('Could not find an option named "$name".');
     }
 
     return _options[name];
   }
 
   /** Get the names of the options as a [Collection]. */
   List<String> get options => _options.keys.toList();
 }