Remove internal uses of deprecated .typed and format

dart-archive · Mar 2, 2018 · 6f3e6fc · 6f3e6fc
1 parent 023eb0d
commit 6f3e6fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/src/lazy_stream.dart b/lib/src/lazy_stream.dart
@@ -4,7 +4,6 @@
 
 import "dart:async";
 
-import "delegate/stream.dart";
 import "stream_completer.dart";
 import "utils.dart";
 
@@ -40,10 +39,10 @@ class LazyStream<T> extends Stream<T> {
     Stream<T> stream;
     if (result is Future<Stream<T>>) {
       stream = StreamCompleter.fromFuture(result.then((stream) {
-        return DelegatingStream.typed<T>(stream);
+        return stream.cast<T>();
       }));
     } else {
-      stream = DelegatingStream.typed<T>(result as Stream);
+      stream = (result as Stream).cast<T>();
     }
 
     return stream.listen(onData,

diff --git a/lib/src/typed_stream_transformer.dart b/lib/src/typed_stream_transformer.dart
@@ -4,8 +4,6 @@
 
 import 'dart:async';
 
-import 'delegate/stream.dart';
-
 /// Creates a wrapper that coerces the type of [transformer].
 ///
 /// This soundly converts a [StreamTransformer] to a `StreamTransformer<S, T>`,
@@ -25,6 +23,5 @@ class _TypeSafeStreamTransformer<S, T> extends StreamTransformerBase<S, T> {
 
   _TypeSafeStreamTransformer(this._inner);
 
-  Stream<T> bind(Stream<S> stream) =>
-      DelegatingStream.typed(_inner.bind(stream));
+  Stream<T> bind(Stream<S> stream) => _inner.bind(stream).cast();
 }