Stop working around issue 2644.

sdk/lib/_internal/pub/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.
 
 /// Generic utility functions. Stuff that should possibly be in core.
 library utils;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
@@ skipping 280 matching lines @@
   var index = toSplit.indexOf(pattern);
   if (index == -1) return [toSplit];
   return [toSplit.substring(0, index),
     toSplit.substring(index + pattern.length)];
 }
 
 /// 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);
+  queryMap.addAll(parameters);
   return url.resolve("?${mapToQuery(queryMap)}");
 }
 
 /// Convert a URL query string (or `application/x-www-form-urlencoded` body)
 /// into a [Map] from parameter names to values.
 Map<String, String> queryToMap(String queryList) {
   var map = {};
   for (var pair in queryList.split("&")) {
     var split = split1(pair, "=");
     if (split.isEmpty) continue;
@@ skipping 23 matching lines @@
 /// Whether [uri1] and [uri2] are equal. This consider HTTP URIs to default to
 /// port 80, and HTTPs URIs to default to port 443.
 bool urisEqual(Uri uri1, Uri uri2) =>
   canonicalizeUri(uri1) == canonicalizeUri(uri2);
 
 /// Return [uri] with redundant port information removed.
 Uri canonicalizeUri(Uri uri) {
   return uri;
 }
 
-/// 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);
-
 /// Decodes a URL-encoded string. Unlike [Uri.decodeComponent], this includes
 /// replacing `+` with ` `.
 String urlDecode(String encoded) =>
   Uri.decodeComponent(encoded.replaceAll("+", " "));
 
 /// Takes a simple data structure (composed of [Map]s, [Iterable]s, scalar
 /// objects, and [Future]s) and recursively resolves all the [Future]s contained
 /// within. Completes with the fully resolved structure.
 Future awaitObject(object) {
   // Unroll nested futures.
@@ skipping 178 matching lines @@
     error is FileIOException ||
     error is HttpException ||
     error is HttpParserException ||
     error is LinkIOException ||
     error is MimeMultipartException ||
     error is OSError ||
     error is ProcessException ||
     error is SocketIOException ||
     error is WebSocketException;
 }