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

pkg/unittest/lib/src/core_matchers.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.
 
 part of matcher;
 
 /**
  * Returns a matcher that matches empty strings, maps or iterables
  * (including collections).
  */
@@ skipping 581 matching lines @@
     } catch (e) {
       return mismatchDescription.add(' has no length property');
     }
   }
 }
 
 /**
  * Returns a matcher that matches if the match argument contains
  * the expected value. For [String]s this means substring matching;
  * for [Map]s it means the map has the key, and for [Iterable]s
- * (including [Collection]s) it means the iterable has a matching
+ * (including [Iterable]s) it means the iterable has a matching
  * element. In the case of iterables, [expected] can itself be a
  * matcher.
  */
 Matcher contains(expected) => new _Contains(expected);
 
 class _Contains extends BaseMatcher {
 
   final _expected;
 
   const _Contains(this._expected);
@@ skipping 25 matching lines @@
 
 class _In extends BaseMatcher {
 
   final _expected;
 
   const _In(this._expected);
 
   bool matches(item, MatchState matchState) {
     if (_expected is String) {
       return _expected.indexOf(item) >= 0;
-    } else if (_expected is Collection) {
+    } else if (_expected is Iterable) {
       return _expected.any((e) => e == item);
     } else if (_expected is Map) {
       return _expected.containsKey(item);
     }
     return false;
   }
 
   Description describe(Description description) =>
       description.add('is in ').addDescriptionOf(_expected);
 }
@@ skipping 63 matching lines @@
       description.add(_featureDescription).add(' ').addDescriptionOf(_matcher);
 
   Description describeMismatch(item, Description mismatchDescription,
                                MatchState matchState, bool verbose) {
     mismatchDescription.add(_featureName).add(' ');
     _matcher.describeMismatch(matchState.state['feature'], mismatchDescription,
         matchState.state['innerState'], verbose);
     return mismatchDescription;
   }
 }