Big merge from experimental to bleeding edge.

pkg/oauth2/lib/src/utils.dart

 // Copyright (c) 2012, 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 utils;
 
+import 'dart:async';
 import 'dart:uri';
 import 'dart:isolate';
 import 'dart:crypto';
 
 /// Adds additional query parameters to [url], overwriting the original
 /// parameters if a name conflict occurs.
 Uri addQueryParameters(Uri url, Map<String, String> parameters) {
   var queryMap = queryToMap(url.query);
   mapAddAll(queryMap, parameters);
   return url.resolve("?${mapToQuery(queryMap)}");
@@ skipping 14 matching lines @@
 }
 
 /// Convert a [Map] from parameter names to values to a URL query string.
 String mapToQuery(Map<String, String> map) {
   var pairs = <List<String>>[];
   map.forEach((key, value) {
     key = encodeUriComponent(key);
     value = (value == null || value.isEmpty) ? null : encodeUriComponent(value);
     pairs.add([key, value]);
   });
-  return Strings.join(pairs.map((pair) {
+  return Strings.join(pairs.mappedBy((pair) {
     if (pair[1] == null) return pair[0];
     return "${pair[0]}=${pair[1]}";
   }), "&");
 }
 
 /// Add all key/value pairs from [source] to [destination], overwriting any
 /// pre-existing values.
 void mapAddAll(Map destination, Map source) =>
   source.forEach((key, value) => destination[key] = value);
 
@@ skipping 53 matching lines @@
 
     if (!paramString.trim().isEmpty) {
       throw new FormatException('Invalid WWW-Authenticate header: "$header"');
     }
 
     return new AuthenticateHeader(scheme, parameters);
   }
 }
 
 /// Returns a [Future] that asynchronously completes to `null`.
-Future get async {
-  var completer = new Completer();
-  new Timer(0, (_) => completer.complete(null));
-  return completer.future;
-}
+Future get async => new Future.delayed(0, () => null);