Replace Future.wait with Iterable<Future>.wait (#188)

Towards #111

Author: natebosch

lib/src/aggregate_sample.dart

@@ -138,7 +138,7 @@ extension AggregateSample<T> on Stream<T> {
         // Handle opt-out nulls
         cancels.removeWhere((Object? f) => f == null);
         if (cancels.isEmpty) return null;
-        return Future.wait(cancels).then((_) => null);
+        return cancels.wait.then((_) => null);
       };
     };
     return controller.stream;

lib/src/async_expand.dart

@@ -81,7 +81,7 @@ extension AsyncExpand<T> on Stream<T> {
         var cancels = [for (var s in subscriptions) s.cancel()]
           // Handle opt-out nulls
           ..removeWhere((Object? f) => f == null);
-        return Future.wait(cancels).then((_) => null);
+        return cancels.wait.then((_) => null);
       };
     };
     return controller.stream;

lib/src/combine_latest.dart

@@ -133,7 +133,7 @@ extension CombineLatest<T> on Stream<T> {
           ..removeWhere((Object? f) => f == null);
         sourceSubscription = null;
         otherSubscription = null;
-        return Future.wait(cancels).then((_) => null);
+        return cancels.wait.then((_) => null);
       };
     };
     return controller.stream;
@@ -234,7 +234,7 @@ extension CombineLatest<T> on Stream<T> {
           // Handle opt-out nulls
           ..removeWhere((Object? f) => f == null);
         if (cancels.isEmpty) return null;
-        return Future.wait(cancels).then((_) => null);
+        return cancels.wait.then((_) => null);
       };
     };
     return controller.stream;

lib/src/merge.dart

@@ -94,7 +94,7 @@ extension Merge<T> on Stream<T> {
           // Handle opt-out nulls
           ..removeWhere((Object? f) => f == null);
         if (cancels.isEmpty) return null;
-        return Future.wait(cancels).then((_) => null);
+        return cancels.wait.then((_) => null);
       };
     };
     return controller.stream;

lib/src/switch.dart

@@ -128,7 +128,7 @@ extension SwitchLatest<T> on Stream<Stream<T>> {
           // Handle opt-out nulls
           ..removeWhere((Object? f) => f == null);
         if (cancels.isEmpty) return null;
-        return Future.wait(cancels).then(_ignore);
+        return cancels.wait.then(_ignore);
       };
     };
     return controller.stream;

test/scan_test.dart

@@ -59,7 +59,7 @@ void main() {
           const TypeMatcher<Future<void>>(),
           const TypeMatcher<Future<void>>()
         ]);
-        expect(await Future.wait(result), [1, 3]);
+        expect(await result.wait, [1, 3]);
       });
 
       test('does not call for subsequent values while waiting', () async {