Remove .writeStream, .consume and rewrite IOSink to correctly implement a (sane) well-defined behav…

sdk/lib/io/file_impl.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.
 
 part of dart.io;
 
 // Read the file in blocks of size 64k.
 const int _BLOCK_SIZE = 64 * 1024;
 
 
@@ skipping 143 matching lines @@
 
   _FileStreamConsumer(File this._file, FileMode mode) {
     _openFuture = _file.open(mode: mode);
   }
 
   _FileStreamConsumer.fromStdio(int fd) {
     assert(1 <= fd && fd <= 2);
     _openFuture = new Future.immediate(_File._openStdioSync(fd));
   }
 
-  Future<File> consume(Stream<List<int>> stream) {
-    return addStream(stream).then((_) => close());
-  }
-
   Future<File> addStream(Stream<List<int>> stream) {
     Completer<File> completer = new Completer<File>();
     _openFuture
       .then((openedFile) {
         _subscription = stream.listen(
           (d) {
             _subscription.pause();
             openedFile.writeList(d, 0, d.length)
               .then((_) => _subscription.resume())
               .catchError((e) {
@@ skipping 291 matching lines @@
   String fullPathSync() {
     var result = _fullPath(_path);
     throwIfError(result, "Cannot retrieve full path for file '$_path'");
     return result;
   }
 
   Stream<List<int>> openRead() {
     return new _FileStream(_path);
   }
 
-  IOSink<File> openWrite({FileMode mode: FileMode.WRITE,
-                          Encoding encoding: Encoding.UTF_8}) {
+  IOSink openWrite({FileMode mode: FileMode.WRITE,
+                    Encoding encoding: Encoding.UTF_8}) {
     if (mode != FileMode.WRITE &&
         mode != FileMode.APPEND) {
       throw new FileIOException(
           "Wrong FileMode. Use FileMode.WRITE or FileMode.APPEND");
     }
     var consumer = new _FileStreamConsumer(this, mode);
-    return new IOSink<File>(consumer, encoding: encoding);
+    return new IOSink(consumer, encoding: encoding);
   }
 
   Future<List<int>> readAsBytes() {
     _ensureFileService();
     Completer<List<int>> completer = new Completer<List<int>>();
     var chunks = new _BufferList();
     openRead().listen(
       (d) => chunks.add(d),
       onDone: () {
         var result = chunks.readBytes(chunks.length);
@@ skipping 51 matching lines @@
     });
   }
 
   List<String> readAsLinesSync({Encoding encoding: Encoding.UTF_8}) {
     return _decodeLines(readAsBytesSync(), encoding);
   }
 
   Future<File> writeAsBytes(List<int> bytes,
                             {FileMode mode: FileMode.WRITE}) {
     try {
-      IOSink<File> sink = openWrite(mode: mode);
+      IOSink sink = openWrite(mode: mode);
       sink.add(bytes);
       sink.close();
       return sink.done.then((_) => this);;
     } catch (e) {
       return new Future.immediateError(e);
     }
   }
 
   void writeAsBytesSync(List<int> bytes, {FileMode mode: FileMode.WRITE}) {
     RandomAccessFile opened = openSync(mode: mode);
@@ skipping 484 matching lines @@
           new FileIOException("File closed '$_path'"));
     });
     return completer.future;
   }
 
   final String _path;
   int _id;
 
   SendPort _fileService;
 }