Commit Martin's patch for pub + lib_v2.

utils/archive/entry.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 entry;
 
 import 'dart:io';
 import 'archive.dart' as archive;
 import 'entry_request.dart';
 import 'read_request.dart' as read;
@@ skipping 254 matching lines @@
     } else if (_input != null) {
       throw new UnsupportedError("An input stream has already been"
           "opened for archive entry $pathname.");
     }
 
     var inputCompleter = new Completer();
     inputComplete = inputCompleter.future;
 
     _input = new ListInputStream();
     // TODO(nweiz): Report errors once issue 3657 is fixed
-    var future = _consumeInput().chain((_) {
+    var future = _consumeInput().then((_) {
       if (!_input.closed) _input.markEndOfStream();
       // Asynchronously complete to give the InputStream callbacks a chance to
       // fire.
       return async();
     }).then((_) => inputCompleter.complete(null));
 
     future.handleException((e) {
       print(e);
       print(future.stackTrace);
     });
@@ skipping 14 matching lines @@
   /**
    * Read all data from the archive and write it to [_input]. Returns a future
    * that completes once this is done.
    *
    * This assumes that both [_input] and [_archiveId] are non-null and that
    * [_input] is open, although if that changes before this completes it will
    * handle it gracefully.
    */
   Future _consumeInput() {
     var data;
-    return call(read.DATA_BLOCK, _archiveId).chain((_data) {
+    return call(read.DATA_BLOCK, _archiveId).then((_data) {
       data = _data;
       // TODO(nweiz): This async() call is only necessary because of issue 4222.
       return async();
-    }).chain((_) {
+    }).then((_) {
       if (_input.closed || _archiveId == null || data == null) {
         return new Future.immediate(null);
       }
       _input.write(data);
       return _consumeInput();
     });
   }
 }
 
 /**
  * An [ArchiveEntry] that contains the complete decompressed contents of the
  * file.
  */
 class CompleteArchiveEntry extends ArchiveEntry {
   /** The contents of the entry as bytes. */
   final List<int> contentBytes;
 
   /** The contents of the entry as a string. */
   String get contents => new String.fromCharCodes(contentBytes);
 
   CompleteArchiveEntry._(List properties, this.contentBytes)
     : super.internal(properties, null);
 }