Adapt streams for additional stackTrace argument.

pkg/sequence_zip/lib/stream_zip.dart

 // Copyright (c) 2013, 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.
 
 /**
  * Help for combining multiple streams into a single stream.
  *
  * This API is also available as part of the
  * [sequence_zip](#sequence_zip) library.
  */
 library stream_zip;
 
 import "dart:async";
 
 /**
  * A stream that combines the values of other streams.
  */
 class StreamZip extends Stream<List> {
   final Iterable<Stream> _streams;
   StreamZip(Iterable<Stream> streams) : _streams = streams;
 
   StreamSubscription<List> listen(void onData(List data), {
-                                  void onError(Object error),
+                                  Function onError,
                                   void onDone(),
                                   bool cancelOnError}) {
     cancelOnError = identical(true, cancelOnError);
     List<StreamSubscription> subscriptions = <StreamSubscription>[];
     StreamController controller;
     List current;
     int dataCount = 0;
 
     /// Called for each data from a subscription in [subscriptions].
     void handleData(int index, data) {
       current[index] = data;
       dataCount++;
       if (dataCount == subscriptions.length) {
         List data = current;
         current = new List(subscriptions.length);
         dataCount = 0;
         for (int i = 0; i < subscriptions.length; i++) {
           if (i != index) subscriptions[i].resume();
         }
         controller.add(data);
       } else {
         subscriptions[index].pause();
       }
     }
 
     /// Called for each error from a subscription in [subscriptons].
     /// Except if [cancelOnError] is true, in which case the function below
     /// is used instead.
-    void handleError(Object error) {
-      controller.addError(error);
+    void handleError(Object error, [StackTrace stackTrace]) {

[Lasse Reichstein Nielsen, 2013/10/04 08:45:17]

Make not optional.

[floitsch, 2013/10/05 18:11:48]

Done.
Are you sure? The closure will be given to the streams in line 75. If these are
"old" streams it will break them.

[Lasse Reichstein Nielsen, 2013/10/07 11:55:48]

Ack. Not optional yet then.

+      controller.addError(error, stackTrace);
     }
 
     /// Called when a subscription has an error and [cancelOnError] is true.
     ///
     /// Prematurely cancels all subscriptions since we know that we won't
     /// be needing any more values.
-    void handleErrorCancel(Object error) {
+    void handleErrorCancel(Object error, [StackTrace stackTrace]) {

[Lasse Reichstein Nielsen, 2013/10/04 08:45:17]

Make not optional.

[floitsch, 2013/10/05 18:11:48]

Done.
ditto.

[Lasse Reichstein Nielsen, 2013/10/07 11:55:48]

Not here either.

       for (int i = 0; i < subscriptions.length; i++) {
         subscriptions[i].cancel();
       }
-      controller.addError(error);
+      controller.addError(error, stackTrace);
     }
 
     void handleDone() {
       for (int i = 0; i < subscriptions.length; i++) {
         subscriptions[i].cancel();
       }
       controller.close();
     }
 
     try {
@@ skipping 38 matching lines @@
 
     if (subscriptions.isEmpty) {
       controller.close();
     }
     return controller.stream.listen(onData,
                                     onError: onError,
                                     onDone: onDone,
                                     cancelOnError: cancelOnError);
   }
 }