Merge branch 'master' into safe-nulls

Author: natebosch

lib/src/aggregate_sample.dart

@@ -136,7 +136,7 @@ extension AggregateSample<T> on Stream<T> {
           triggerSub!.pause();
         }
         if (cancels.isEmpty) return null;
-        return Future.wait(cancels).then((_) => null);
+        return cancels.wait.then((_) => null);
       };
     };
     return controller.stream;

lib/src/combine_latest.dart

@@ -131,7 +131,7 @@ extension CombineLatest<T> on Stream<T> {
         ];
         sourceSubscription = null;
         otherSubscription = null;
-        return Future.wait(cancels).then((_) => null);
+        return cancels.wait.then((_) => null);
       };
     };
     return controller.stream;

lib/src/switch.dart

@@ -126,7 +126,7 @@ extension SwitchLatest<T> on Stream<Stream<T>> {
           if (sub != null) sub.cancel(),
         ];
         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 {