Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Unified Diff: lib/src/utils.dart

Issue 1843323002: Fix most strong mode warnings. (Closed) Base URL: git@github.com:dart-lang/http_multi_server@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/http_multi_server.dart ('k') | pubspec.yaml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/utils.dart
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index ceb5c82f8752c324fc9e9d471711323a3950e776..19188cbe7fe534834dddb68ad8aa83b9c5d3047c 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -5,56 +5,20 @@
import 'dart:async';
import 'dart:io';
-/// Merges all streams in [streams] into a single stream that emits all of their
-/// values.
-///
-/// The returned stream will be closed only when every stream in [streams] is
-/// closed.
-Stream mergeStreams(Iterable<Stream> streams) {
- var subscriptions = new Set();
- var controller;
- controller = new StreamController(onListen: () {
- for (var stream in streams) {
- var subscription;
- subscription = stream.listen(controller.add,
- onError: controller.addError,
- onDone: () {
- subscriptions.remove(subscription);
- if (subscriptions.isEmpty) controller.close();
- });
- subscriptions.add(subscription);
- }
- }, onCancel: () {
- for (var subscription in subscriptions) {
- subscription.cancel();
- }
- }, onPause: () {
- for (var subscription in subscriptions) {
- subscription.pause();
- }
- }, onResume: () {
- for (var subscription in subscriptions) {
- subscription.resume();
- }
- }, sync: true);
-
- return controller.stream;
-}
-
/// A cache for [supportsIpV6].
bool _supportsIpV6;
/// Returns whether this computer supports binding to IPv6 addresses.
-Future<bool> get supportsIpV6 {
- if (_supportsIpV6 != null) return new Future.value(_supportsIpV6);
+Future<bool> get supportsIpV6 async {
+ if (_supportsIpV6 != null) return _supportsIpV6;
- return ServerSocket.bind(InternetAddress.LOOPBACK_IP_V6, 0).then((socket) {
+ try {
+ var socket = await ServerSocket.bind(InternetAddress.LOOPBACK_IP_V6, 0);
_supportsIpV6 = true;
socket.close();
return true;
- }).catchError((error) {
- if (error is! SocketException) throw error;
+ } on SocketException catch (_) {
_supportsIpV6 = false;
return false;
- });
+ }
}
« no previous file with comments | « lib/http_multi_server.dart ('k') | pubspec.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698