Merge IO v2 branch to bleeding edge

tools/line_doc_comments.dart

 #!/usr/bin/env dart
 
 /// Converts block-style Doc comments in Dart code to line style.
 library line_doc_comments;
 import 'dart:io';
 
 import '../pkg/path/lib/path.dart' as path;
 
 final oneLineBlock = new RegExp(r'^(\s*)/\*\*\s?(.*)\*/\s*$');
 final startBlock = new RegExp(r'^(\s*)/\*\*(.*)$');
 final blockLine = new RegExp(r'^\s*\*\s?(.*)$');
 final endBlock = new RegExp(r'^\s*\*/\s*$');
 
 main() {
   var args = new Options().arguments;
   if (args.length != 1) {
     print('Converts "/**"-style block doc comments in a directory ');
     print('containing Dart code to "///"-style line doc comments.');
     print('');
     print('Usage: line_doc_coments.dart <dir>');
     return;
   }
 
   var dir = new Directory(args[0]);
-  var lister = dir.list(recursive: true);
-  lister.onFile = (file) {
-    if (path.extension(file) != '.dart') return;
-    fixFile(file);
-  };
+  dir.list(recursive: true).listen(
+      (entity) {
+        if (entity is File) {
+          var file = entity.name;
+          if (path.extension(file) != '.dart') return;
+          fixFile(file);
+        }
+      });
 }
 
 void fixFile(String path) {
   var file = new File(path);
   file.readAsLines().transform(fixContents).chain((fixed) {
     return new File(path).writeAsString(fixed);
   }).then((file) {
     print(file.name);
   });
 }
@@ skipping 38 matching lines @@
           }
         }
       }
     }
 
     if (line != null) buffer.add('$line\n');
   }
 
   return buffer.toString();
 }