Remove Collection, Collections and clean up List/Set/Queue implementations of retain/remove.

utils/pub/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:crypto';
 import 'dart:isolate';
@@ skipping 92 matching lines @@
   var iterator = iter.iterator;
   var currentIsValid = iterator.moveNext();
   assert(currentIsValid);
   var obj = iterator.current;
   assert(!iterator.moveNext());
   return obj;
 }
 
 /// Returns a set containing all elements in [minuend] that are not in
 /// [subtrahend].
-Set setMinus(Collection minuend, Collection subtrahend) {
+Set setMinus(Iterable minuend, Iterable subtrahend) {
   var minuendSet = new Set.from(minuend);
   minuendSet.removeAll(subtrahend);
   return minuendSet;
 }
 
 /// Replace each instance of [matcher] in [source] with the return value of
 /// [fn].
 String replace(String source, Pattern matcher, String fn(Match)) {
   var buffer = new StringBuffer();
   var start = 0;
@@ skipping 202 matching lines @@
 /// 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 [decodeUriComponent], this includes
 /// replacing `+` with ` `.
 String urlDecode(String encoded) =>
   decodeUriComponent(encoded.replaceAll("+", " "));
 
 /// Takes a simple data structure (composed of [Map]s, [List]s, scalar objects,

[nweiz, 2013/04/11 20:36:19]

"[List]s" -> "[Iterable]s"

[Anders Johnsen, 2013/04/12 09:31:14]

Done.

 /// and [Future]s) and recursively resolves all the [Future]s contained within.
 /// Completes with the fully resolved structure.
 Future awaitObject(object) {
   // Unroll nested futures.
   if (object is Future) return object.then(awaitObject);
-  if (object is Collection) {
+  if (object is List || object is Set) {

[nweiz, 2013/04/11 20:36:19]

I think this should be "object is Iterable".

[Anders Johnsen, 2013/04/12 09:31:14]

Done.

     return Future.wait(object.map(awaitObject).toList());
   }
   if (object is! Map) return new Future.immediate(object);
 
   var pairs = <Future<Pair>>[];
   object.forEach((key, value) {
     pairs.add(awaitObject(value)
         .then((resolved) => new Pair(key, resolved)));
   });
   return Future.wait(pairs).then((resolvedPairs) {
     var map = {};
     for (var pair in resolvedPairs) {
       map[pair.first] = pair.last;
     }
     return map;
   });
 }