Revert "Various clean-ups and null-safety improvements. (#140)" (#152)

natebosch · web-flow · commit e4d75c146143 · 2021-01-29T10:13:38.000-08:00
This reverts commit 05b9553. Since this has not been published or rolled through to the SDK or Flutter we will hold it back to reduce risk.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,3 @@
-## 2.5.0-nullsafety.4-dev
-
 ## 2.5.0-nullsafety.3
 
 * Update SDK constraints to `>=2.12.0-0 <3.0.0` based on beta release
diff --git a/lib/src/async_cache.dart b/lib/src/async_cache.dart
@@ -42,7 +42,7 @@ class AsyncCache<T> {
   /// The [duration] starts counting after the Future returned by [fetch]
   /// completes, or after the Stream returned by [fetchStream] emits a done
   /// event.
-  AsyncCache(Duration duration) : _duration = duration;
+  AsyncCache(this._duration);
 
   /// Creates a cache that invalidates after an in-flight request is complete.
   ///
diff --git a/lib/src/result/result.dart b/lib/src/result/result.dart
@@ -99,7 +99,7 @@ abstract class Result<T> {
   static Future<List<Result<T>>> captureAll<T>(Iterable<FutureOr<T>> elements) {
     var results = <Result<T>?>[];
     var pending = 0;
-    var completer = Completer<List<Result<T>>>();
+    late Completer<List<Result<T>>> completer;
     for (var element in elements) {
       if (element is Future<T>) {
         var i = results.length;
@@ -116,8 +116,9 @@ abstract class Result<T> {
       }
     }
     if (pending == 0) {
-      completer.complete(List.from(results));
+      return Future.value(List.from(results));
     }
+    completer = Completer<List<Result<T>>>();
     return completer.future;
   }
 
diff --git a/lib/src/single_subscription_transformer.dart b/lib/src/single_subscription_transformer.dart
@@ -18,8 +18,10 @@ class SingleSubscriptionTransformer<S, T> extends StreamTransformerBase<S, T> {
 
   @override
   Stream<T> bind(Stream<S> stream) {
-    var controller = StreamController<T>(sync: true);
-    var subscription = stream.listen((value) {
+    late StreamSubscription<S> subscription;
+    var controller =
+        StreamController<T>(sync: true, onCancel: () => subscription.cancel());
+    subscription = stream.listen((value) {
       // TODO(nweiz): When we release a new major version, get rid of the second
       // type parameter and avoid this conversion.
       try {
@@ -28,7 +30,6 @@ class SingleSubscriptionTransformer<S, T> extends StreamTransformerBase<S, T> {
         controller.addError(error, stackTrace);
       }
     }, onError: controller.addError, onDone: controller.close);
-    controller.onCancel = subscription.cancel;
     return controller.stream;
   }
 }
diff --git a/lib/src/stream_group.dart b/lib/src/stream_group.dart
@@ -29,7 +29,7 @@ import 'dart:async';
 class StreamGroup<T> implements Sink<Stream<T>> {
   /// The stream through which all events from streams in the group are emitted.
   Stream<T> get stream => _controller.stream;
-  final StreamController<T> _controller;
+  late StreamController<T> _controller;
 
   /// Whether the group is closed, meaning that no more streams may be added.
   var _closed = false;
@@ -72,20 +72,19 @@ class StreamGroup<T> implements Sink<Stream<T>> {
   }
 
   /// Creates a new stream group where [stream] is single-subscriber.
-  StreamGroup() : _controller = StreamController<T>(sync: true) {
-    _controller
-      ..onListen = _onListen
-      ..onPause = _onPause
-      ..onResume = _onResume
-      ..onCancel = _onCancel;
+  StreamGroup() {
+    _controller = StreamController<T>(
+        onListen: _onListen,
+        onPause: _onPause,
+        onResume: _onResume,
+        onCancel: _onCancel,
+        sync: true);
   }
 
   /// Creates a new stream group where [stream] is a broadcast stream.
-  StreamGroup.broadcast()
-      : _controller = StreamController<T>.broadcast(sync: true) {
-    _controller
-      ..onListen = _onListen
-      ..onCancel = _onCancelBroadcast;
+  StreamGroup.broadcast() {
+    _controller = StreamController<T>.broadcast(
+        onListen: _onListen, onCancel: _onCancelBroadcast, sync: true);
   }
 
   /// Adds [stream] as a member of this group.
diff --git a/lib/src/stream_zip.dart b/lib/src/stream_zip.dart
@@ -22,7 +22,7 @@ class StreamZip<T> extends Stream<List<T>> {
       {Function? onError, void Function()? onDone, bool? cancelOnError}) {
     cancelOnError = identical(true, cancelOnError);
     var subscriptions = <StreamSubscription<T>>[];
-    var controller = StreamController<List<T>>();
+    late StreamController<List<T>> controller;
     late List<T?> current;
     var dataCount = 0;
 
@@ -32,7 +32,7 @@ class StreamZip<T> extends Stream<List<T>> {
       dataCount++;
       if (dataCount == subscriptions.length) {
         var data = List<T>.from(current);
-        current.fillRange(0, current.length, null);
+        current = List<T?>.filled(subscriptions.length, null);
         dataCount = 0;
         for (var i = 0; i < subscriptions.length; i++) {
           if (i != index) subscriptions[i].resume();
@@ -87,26 +87,23 @@ class StreamZip<T> extends Stream<List<T>> {
 
     current = List<T?>.filled(subscriptions.length, null);
 
-    controller
-      ..onPause = () {
-        for (var i = 0; i < subscriptions.length; i++) {
-          // This may pause some subscriptions more than once.
-          // These will not be resumed by onResume below, but must wait for the
-          // next round.
-          subscriptions[i].pause();
-        }
+    controller = StreamController<List<T>>(onPause: () {
+      for (var i = 0; i < subscriptions.length; i++) {
+        // This may pause some subscriptions more than once.
+        // These will not be resumed by onResume below, but must wait for the
+        // next round.
+        subscriptions[i].pause();
       }
-      ..onResume = () {
-        for (var i = 0; i < subscriptions.length; i++) {
-          subscriptions[i].resume();
-        }
+    }, onResume: () {
+      for (var i = 0; i < subscriptions.length; i++) {
+        subscriptions[i].resume();
       }
-      ..onCancel = () {
-        for (var i = 0; i < subscriptions.length; i++) {
-          // Canceling more than once is safe.
-          subscriptions[i].cancel();
-        }
-      };
+    }, onCancel: () {
+      for (var i = 0; i < subscriptions.length; i++) {
+        // Canceling more than once is safe.
+        subscriptions[i].cancel();
+      }
+    });
 
     if (subscriptions.isEmpty) {
       controller.close();
diff --git a/lib/src/subscription_stream.dart b/lib/src/subscription_stream.dart
@@ -31,12 +31,12 @@ class SubscriptionStream<T> extends Stream<T> {
   /// an error.
   SubscriptionStream(StreamSubscription<T> subscription)
       : _source = subscription {
+    var source = _source!;
+    source.pause();
     // Clear callbacks to avoid keeping them alive unnecessarily.
-    subscription
-      ..pause()
-      ..onData(null)
-      ..onError(null)
-      ..onDone(null);
+    source.onData(null);
+    source.onError(null);
+    source.onDone(null);
   }
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: async
-version: 2.5.0-nullsafety.4-dev
+version: 2.5.0-nullsafety.3
 
 description: Utility functions and classes related to the 'dart:async' library.
 homepage: https://www.github.com/dart-lang/async

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-## 2.5.0-nullsafety.4-dev`
`2`		`-`
`3`	`1`	`## 2.5.0-nullsafety.3`
`4`	`2`
`5`	`3`	* Update SDK constraints to `>=2.12.0-0 <3.0.0` based on beta release
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ abstract class Result<T> {`
`99`	`99`	`static Future<List<Result<T>>> captureAll<T>(Iterable<FutureOr<T>> elements) {`
`100`	`100`	`var results = <Result<T>?>[];`
`101`	`101`	`var pending = 0;`
`102`		`- var completer = Completer<List<Result<T>>>();`
	`102`	`+ late Completer<List<Result<T>>> completer;`
`103`	`103`	`for (var element in elements) {`
`104`	`104`	`if (element is Future<T>) {`
`105`	`105`	`var i = results.length;`
`@@ -116,8 +116,9 @@ abstract class Result<T> {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`if (pending == 0) {`
`119`		`- completer.complete(List.from(results));`
	`119`	`+ return Future.value(List.from(results));`
`120`	`120`	`}`
	`121`	`+ completer = Completer<List<Result<T>>>();`
`121`	`122`	`return completer.future;`
`122`	`123`	`}`
`123`	`124`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,10 @@ class SingleSubscriptionTransformer<S, T> extends StreamTransformerBase<S, T> {`
`18`	`18`
`19`	`19`	`@override`
`20`	`20`	`Stream<T> bind(Stream<S> stream) {`
`21`		`- var controller = StreamController<T>(sync: true);`
`22`		`- var subscription = stream.listen((value) {`
	`21`	`+ late StreamSubscription<S> subscription;`
	`22`	`+ var controller =`
	`23`	`+ StreamController<T>(sync: true, onCancel: () => subscription.cancel());`
	`24`	`+ subscription = stream.listen((value) {`
`23`	`25`	`// TODO(nweiz): When we release a new major version, get rid of the second`
`24`	`26`	`// type parameter and avoid this conversion.`
`25`	`27`	`try {`
`@@ -28,7 +30,6 @@ class SingleSubscriptionTransformer<S, T> extends StreamTransformerBase<S, T> {`
`28`	`30`	`controller.addError(error, stackTrace);`
`29`	`31`	`}`
`30`	`32`	`}, onError: controller.addError, onDone: controller.close);`
`31`		`- controller.onCancel = subscription.cancel;`
`32`	`33`	`return controller.stream;`
`33`	`34`	`}`
`34`	`35`	`}`