Big merge from experimental to bleeding edge.

pkg/serialization/lib/serialization.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.
 
 /**
  * This provides a general-purpose serialization facility for Dart objects. A
  * [Serialization] is defined in terms of [SerializationRule]s and supports
  * reading and writing to different formats.
  *
  * Setup
@@ skipping 131 matching lines @@
  * or as an additional parameter to the reading methods.
  *
  *     new Serialization()
  *       ..addRuleFor(new Person(), constructorFields: ["name"])
  *       ..externalObjects['Person'] = reflect(new Person()).type;
  */
 library serialization;
 
 import 'src/mirrors_helpers.dart';
 import 'src/serialization_helpers.dart';
-import 'dart:json' show JSON;
+import 'dart:async';
+import 'dart:json' as json;
 
 part 'src/reader_writer.dart';
 part 'src/serialization_rule.dart';
 part 'src/basic_rule.dart';
 
 /**
  * This class defines a particular serialization scheme, in terms of
  * [SerializationRule] instances, and supports reading and writing them.
  * See library comment for examples of usage.
  */
@@ skipping 31 matching lines @@
   bool _selfDescribing;
 
   /**
    * When we write out data using this serialization, should we also write
    * out a description of the rules. This is on by default unless using
    * CustomRule subclasses, in which case it requires additional setup and
    * is off by default.
    */
   bool get selfDescribing {
     if (_selfDescribing != null) return _selfDescribing;
-    return !_rules.some((x) => x is CustomRule);
+    return !_rules.any((x) => x is CustomRule);
   }
 
   /**
    * When we write out data using this serialization, should we also write
    * out a description of the rules. This is on by default unless using
    * CustomRule subclasses, in which case it requires additional setup and
    * is off by default.
    */
   set selfDescribing(x) => _selfDescribing = x;
 
@@ skipping 140 matching lines @@
     // consider having the arbitrary predicates be secondary to an initial
     // class-based lookup mechanism.
     var target, candidateRules;
     if (object is DesignatedRuleForObject) {
       target = object.target;
       candidateRules = object.possibleRules(_rules);
     } else {
       target = object;
       candidateRules = _rules;
     }
-    List applicable = candidateRules.filter(
-        (each) => each.appliesTo(target, w));
+    List applicable =
+        candidateRules.where((each) => each.appliesTo(target, w)).toList();
 
     if (applicable.isEmpty) {
       return [addRuleFor(target)];
     }
 
     if (applicable.length == 1) return applicable;
     var first = applicable[0];
-    var finalRules = applicable.filter(
-        (x) => !x.mustBePrimary || (x == first));
+    var finalRules = applicable.where(
+        (x) => !x.mustBePrimary || (x == first)).toList();
 
     if (finalRules.isEmpty) throw new SerializationException(
         'No valid rule found for object $object');
     return finalRules;
   }
 
   /**
    * Create a Serialization for serializing SerializationRules. This is used
    * to save the rules in a self-describing format along with the data.
    * If there are new rule classes created, they will need to be described
@@ skipping 43 matching lines @@
     return ifAbsent == null ? null : ifAbsent();
   }
 }
 
 /**
  * An exception class for errors during serialization.
  */
 class SerializationException implements Exception {
   final String message;
   const SerializationException([this.message]);
-}
+}