Commit Martin's patch for pub + lib_v2.

utils/archive/input_stream.dart

 // Copyright (c) 2012, 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.
 
 library input_stream;
 
 import 'archive.dart' as archive;
 import 'entry.dart';
 import 'read_request.dart';
 import 'utils.dart';
@@ skipping 57 matching lines @@
    * [onEntry].
    */
   Future<List<CompleteArchiveEntry>> readAll() {
     var completer = new Completer<List<Future<CompleteArchiveEntry>>>();
     var result = <Future<CompleteArchiveEntry>>[];
 
     this.onEntry = (entry) => result.add(entry.readAll());
     this.onError = (e, stack) => completer.completeException(e, stack);
     this.onClosed = () => completer.complete(result);
 
-    return completer.future.chain(Futures.wait);
+    return completer.future.then(Futures.wait);
   }
 
   /**
    * Sets a callback to call when a new entry is read from the archive.
    *
    * The [ArchiveEntry] that's read from an archive initially only contains
    * header information such as the filename and permissions. To get the actual
    * data contained in the entry, use [ArchiveEntry.openInputStream].
    *
    * Since the entries are read in sequence from the archive, the data stream
@@ skipping 34 matching lines @@
     if (_currentEntry != null) _currentEntry.close();
     if (!_onEntryCompleter.future.isComplete) _onEntryCompleter.complete(null);
   }
 
   /**
    * Consumes and emits all [ArchiveEntries] in this archive.
    */
   Future _consumeHeaders() {
     if (closed) return new Future.immediate(null);
     var data;
-    return call(NEXT_HEADER, _id.value).chain((_data) {
+    return call(NEXT_HEADER, _id.value).then((_data) {
       data = _data;
       if (data == null) return new Future.immediate(null);
       return _emit(new archive.ArchiveEntry.internal(data, _id.value)).
-        chain((_) => _consumeHeaders());
+        then((_) => _consumeHeaders());
     });
   }
 
   /**
    * Emits [entry] to the [onEntry] callback. Returns a [Future] that will
    * complete once the callback's return value completes and the entry's data
    * has been fully consumed.
    */
   Future _emit(ArchiveEntry entry) {
     _currentEntry = entry;
-    var future = _onEntryCompleter.future.chain((onEntry) {
+    var future = _onEntryCompleter.future.then((onEntry) {
       if (closed) return new Future.immediate(null);
       var result = onEntry(entry);
       if (result is Future) return result;
       return new Future.immediate(null);
-    }).chain((_) {
+    }).then((_) {
       if (entry.isInputOpen) return entry.inputComplete;
       return new Future.immediate(null);
     });
-    future.onComplete((_) {
+    future.whenComplete(() {
       _currentEntry = null;
       entry.close();
     });
     return future;
   }
 }