Unify dart:async and pub/io.dart TimeoutException classes.

sdk/lib/_internal/pub/lib/src/io.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Helper functionality to make working with IO easier.
 library pub.io;
 
-import 'dart:async' hide TimeoutException;
+import 'dart:async';
+export 'dart:async' show TimeoutException;

[Bob Nystrom, 2013/12/02 22:40:42]

Let's remove this and just change any other files that need to this import
dart:async if they aren't already.

[Lasse Reichstein Nielsen, 2013/12/03 08:38:29]

Removed.
I don't think it's needed anywhere, but I didn't want to change the public
signature of the library because I don't know where it is used. It's probably
only internal use, so it should be fine.

 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
 import 'package:http/http.dart' show ByteStream;
 import 'package:stack_trace/stack_trace.dart';
 
 import 'error_group.dart';
 import 'log.dart' as log;
@@ skipping 603 matching lines @@
 }
 
 /// Wraps [input] to provide a timeout. If [input] completes before
 /// [milliseconds] have passed, then the return value completes in the same way.
 /// However, if [milliseconds] pass before [input] has completed, it completes
 /// with a [TimeoutException] with [description] (which should be a fragment
 /// describing the action that timed out).
 ///
 /// Note that timing out will not cancel the asynchronous operation behind
 /// [input].
 Future timeout(Future input, int milliseconds, String description) {

[nweiz, 2013/12/02 23:54:22]

Add a TODO assigned to me to replace this with [Future.timeout].

[Lasse Reichstein Nielsen, 2013/12/03 08:38:29]

Done.

   var completer = new Completer();
-  var timer = new Timer(new Duration(milliseconds: milliseconds), () {
+  var duration = new Duration(milliseconds: milliseconds);
+  var timer = new Timer(duration, () {
     completer.completeError(new TimeoutException(
-        'Timed out while $description.'),
+        'Timed out while $description.', duration),
         new Trace.current());
   });
   input.then((value) {
     if (completer.isCompleted) return;
     timer.cancel();
     completer.complete(value);
   }).catchError((e, stackTrace) {
     if (completer.isCompleted) return;
     timer.cancel();
     completer.completeError(e, stackTrace);
@@ skipping 162 matching lines @@
     });
   }).catchError((e, stackTrace) {
     // We don't have to worry about double-signaling here, since the store()
     // above will only be reached if everything succeeds.
     controller.addError(e, stackTrace);
     controller.close();
   });
   return new ByteStream(controller.stream);
 }
 
-/// Exception thrown when an operation times out.
-class TimeoutException implements Exception {
-  final String message;
-
-  const TimeoutException(this.message);
-
-  String toString() => message;
-}
-
 /// Contains the results of invoking a [Process] and waiting for it to complete.
 class PubProcessResult {
   final List<String> stdout;
   final List<String> stderr;
   final int exitCode;
 
   const PubProcessResult(this.stdout, this.stderr, this.exitCode);
 
   bool get success => exitCode == 0;
 }
 
 /// Gets a [Uri] for [uri], which can either already be one, or be a [String].
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return Uri.parse(uri);
 }