From 94e501778ab6eeeab7c57ee83874cc4f7cc78397 Mon Sep 17 00:00:00 2001
From: Damon Douglas <damon@hospiq.com>
Date: Tue, 11 Aug 2015 23:51:10 -0400
Subject: [PATCH 1/3] Fix #92: rewrite samples using async await.

---
 .../deleting_a_file_directory_or_symlink.dart | 24 ++++++------
 .../directories/creating_a_directory.dart     |  9 ++---
 .../creating_a_temporary_directory.dart       |  9 ++---
 .../files/creating_a_file.dart                | 10 ++---
 .../handling_errors_when_reading_a_file.dart  | 18 +++------
 .../files/reading_a_file_as_a_string.dart     |  7 ++--
 .../files/reading_a_file_as_bytes.dart        | 11 +++---
 .../files/reading_a_file_as_lines.dart        |  7 ++--
 .../files/writing_a_string_to_a_file.dart     |  8 ++--
 .../files/writing_bytes_to_a_file.dart        | 17 ++++-----
 ...nding_the_type_of_a_filesystem_object.dart | 38 +++++++++----------
 .../renaming_a_file_directory_or_symlink.dart | 21 +++++-----
 ...ecking_if_a_path_represents_a_symlink.dart |  7 ++--
 .../symlinks/creating_a_symlink.dart          | 21 ++++------
 .../getting_the_target_of_a_link.dart         | 32 +++++++---------
 .../example/http/adding_custom_headers.dart   | 25 ++++++------
 .../http/getting_redirection_history.dart     | 17 ++++-----
 ...the_response_content_in_binary_format.dart | 13 +++----
 .../http/getting_the_response_headers.dart    | 21 +++++-----
 .../http/handling_an_httprequest_error.dart   | 19 +++++-----
 .../example/http/making_a_get_request.dart    |  9 ++---
 .../example/http/making_a_post_request.dart   |  9 ++---
 ..._multiple_requests_to_the_same_server.dart | 20 ++++------
 .../http/reading_the_response_body.dart       |  4 +-
 ...mplementing_a_Hello_World_http_server.dart | 17 ++++-----
 .../listing_directory_contents.dart           |  9 ++---
 ...outing_requests_based_on_url_patterns.dart | 15 ++++----
 .../example/http_server/serving_a_404.dart    | 17 ++++-----
 .../http_server/serving_index_html.dart       | 11 +++---
 ..._the_exit_code_when_running_a_process.dart | 12 +++---
 .../running_a_process.dart                    |  7 ++--
 ...getting_information_about_a_file_path.dart | 17 ++++-----
 .../sockets/using_serversockets_client.dart   |  9 ++---
 .../sockets/using_serversockets_server.dart   | 14 +++----
 .../websockets/using_websockets_client.dart   |  7 ++--
 .../websockets/using_websockets_server.dart   | 18 ++++-----
 .../deferred_loading_example/bin/main.dart    |  7 ++--
 .../deferred_loading_example/pubspec.yaml     |  2 +-
 .../lazyloader/web/main.dart                  | 19 ++++++----
 39 files changed, 251 insertions(+), 306 deletions(-)

diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
index c8bfcf8..1072ef2 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
@@ -8,17 +8,17 @@
 
 import 'dart:io';
 
-void main() {
+void main() async {
+
   // Create a temporary directory.
-  Directory.systemTemp.createTemp('my_temp_dir')
-    .then((directory) {
-      // Confirm it exists.
-      directory.exists().then(print); // Prints 'true'.
-      // Delete the directory.
-      return directory.delete();
-    })
-    .then((directory) {
-      // Confirm it no longer exists.
-      directory.exists().then(print); // Prints 'false'
-    });
+  var dir = await Directory.systemTemp.createTemp('my_temp_dir');
+  
+  // Confirm it exists.
+  print(await dir.exists());
+  
+  // Delete the directory.
+  await dir.delete();
+  
+  // Confirm it no longer exists.
+  print(await dir.exists());
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
index c2d16f8..2e12799 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
@@ -8,11 +8,8 @@
 
 import 'dart:io';
 
-void main() {
+void main() async {
   // Creates dir/ and dir/subdir/.
-  new Directory('dir/subdir').create(recursive: true)
-    // The created directory is returned as a Future.
-    .then((Directory directory) {
-      print(directory.path);
-  });
+  var directory = await new Directory('dir/subdir');
+  print(directory.path);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart
index 8db0538..cd4b5c2 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart
@@ -8,10 +8,7 @@
 
 import 'dart:io';
 
-void main() {
-  // Create a temporary directory in the system temp directory.
-  Directory.systemTemp.createTemp('my_temp_dir')
-    .then((directory) {
-      print(directory.path);
-    });
+void main() async {
+  var directory = await Directory.systemTemp.createTemp('my_temp_dir');
+  print(directory.path);
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
index 5e617c3..d4b4fbf 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
@@ -8,16 +8,12 @@
 
 import 'dart:io';
 
-void main() {
+void main() async {
 
   // Get the system temp directory.
   var systemTempDir = Directory.systemTemp;
-
   // Creates dir/, dir/subdir/, and dir/subdir/file.txt in the system
   // temp directory.
-  new File('${systemTempDir.path}/dir/subdir/file.txt').create(recursive: true)
-    // The created file is returned as a Future.
-    .then((file) {
-      print(file.path);
-  });
+  var file = await new File('${systemTempDir.path}/dir/subdir/file.txt').create(recursive: true);
+  print(file.path);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart
index d1f28cb..62764ae 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart
@@ -2,9 +2,6 @@
 // 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.
 
-/// Use `then()` to read the file contents, and `catchError()` to catch
-/// errors. Register a callback with `catchError()` to handle the error.
-
 import 'dart:io';
 
 void handleError(e) {
@@ -12,14 +9,11 @@ void handleError(e) {
   print(e.message);
 }
 
-main() {
+main() async {
   final filename = 'non_existent_file.txt';
-  new File(filename).readAsString()
-    // Read and print the file contents.
-    .then(print)
-    // Catch errors.
-    .catchError((e) {
-      print('There was a ${e.runtimeType} error');
-      print('Could not read $filename');
-    });
+  try {
+    var file = await new File(filename).readAsString();
+  } catch(e) {
+    handleError(e);    
+  }
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart
index 51af45c..6cd93e1 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart
@@ -6,8 +6,7 @@
 
 import 'dart:io';
 
-void main() {
-  new File('file.txt').readAsString().then((String contents) {
-    // Do something with the file contents.
-  });
+main() async {
+  var contents = await new File('file.txt').readAsString();
+  print(contents);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart
index 1e42163..7205841 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart
@@ -8,10 +8,9 @@ import 'dart:io';
 
 import 'package:crypto/crypto.dart';
 
-void main() {
-  new File('file.txt').readAsBytes().then((bytes) {
-    // Do something with the bytes. For example, convert to base64.
-    String base64 = CryptoUtils.bytesToBase64(bytes);
-    // ...
-  });
+main() async {
+  var bytes = await new File('file.txt').readAsBytes();
+  // Do something with the bytes. For example, convert to base64.
+  String base64 = CryptoUtils.bytesToBase64(bytes);
+  print(base64);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
index ca314b4..3fcadf4 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
@@ -6,8 +6,7 @@
 
 import 'dart:io';
 
-void main() {
-  new File('file.txt').readAsLines().then((List<String> lines) {
-    // Do something with lines.
-  });
+void main() async {
+  List<String> lines = await new File('file.txt').readAsLines();
+  lines.forEach((String line) => print(line));
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
index a35402d..3f70ea4 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
@@ -7,10 +7,8 @@
 
 import 'dart:io';
 
-void main() {
+void main() async {
   final filename = 'file.txt';
-  new File(filename).writeAsString('some content')
-    .then((File file) {
-      // Do something with the file.
-    });
+  var file = await new File(filename).writeAsString('some content');
+  print("Content written to $file");
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart
index c498cb7..ae23b88 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart
@@ -7,16 +7,15 @@
 import 'dart:io';
 import 'dart:convert';
 
-void main() {
+main() async {
   final string = 'Dart!';
+
   // Encode to UTF8.
   var encodedData = UTF8.encode(string);
+  var file = await new File('file.txt');
+  file.writeAsBytes(encodedData);
+  var data = await file.readAsBytes();
 
-  new File('file.txt')
-    .writeAsBytes(encodedData)
-    .then((file) => file.readAsBytes())
-    .then((data) {
-      // Decode to a string, and print.
-      print(UTF8.decode(data)); // Prints 'Dart!'.
-  });
-}
+  // Decode to a string, and print.
+  print(UTF8.decode(data)); // Prints 'Dart!'.
+}
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
index d8cf06b..9c6ac79 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
@@ -10,26 +10,26 @@ import 'dart:io';
 void main() {
   // List the contents of the system temp directory.
   Directory.systemTemp.list(recursive: true, followLinks: false)
-    .listen((FileSystemEntity entity) {
+    .listen((FileSystemEntity entity) async {
       // Get the type of the FileSystemEntity, apply the appropiate label, and
       // print the entity path.
-      FileSystemEntity.type(entity.path)
-        .then((FileSystemEntityType type) {
-          String label;
-          switch (type) {
-            case FileSystemEntityType.DIRECTORY:
-              label = 'D';
-              break;
-            case FileSystemEntityType.FILE:
-              label = 'F';
-              break;
-            case FileSystemEntityType.LINK:
-              label = 'L';
-              break;
-            default:
-              label = 'UNKNOWN';
-          }
-          print('$label: ${entity.path}');
-      });
+      FileSystemEntityType type = await FileSystemEntity.type(entity.path);
+      
+      String label;
+      switch (type) {
+        case FileSystemEntityType.DIRECTORY:
+          label = 'D';
+          break;
+        case FileSystemEntityType.FILE:
+          label = 'F';
+          break;
+        case FileSystemEntityType.LINK:
+          label = 'L';
+          break;
+        default:
+          label = 'UNKNOWN';
+      }
+      print('$label: ${entity.path}');
+
     });
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
index a3565a5..84a1043 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
@@ -8,18 +8,19 @@
 
 import 'dart:io';
 
-void main() {
+void main() async {
   // Get the system temp directory.
   var systemTempDir = Directory.systemTemp;
 
   // Create a file.
-  new File('${systemTempDir.path}/foo.txt').create()
-    .then((file) {
-      print('The path is ${file.path}'); // Prints path ending with `foo.txt`.
-      // Rename the file.
-      return file.rename('${systemTempDir.path}/bar.txt');
-    })
-    .then((file) {
-      print('The path is ${file.path}'); // Prints path ending with `bar.txt`.
-    });
+  var file = await new File('${systemTempDir.path}/foo.txt').create();
+
+  // Prints path ending with `foo.txt`.
+  print('The path is ${file.path}');
+  
+  // Rename the file.
+  await file.rename('${systemTempDir.path}/bar.txt');
+  
+  // Prints path ending with `bar.txt`.
+  print('The path is ${file.path}');
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
index 324b591..e5223af 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
@@ -9,10 +9,9 @@ void main() {
 
   // List the contents of the system temp directory.
   systemTempDir.list(recursive: true, followLinks: false)
-    .listen((FileSystemEntity entity) {
+    .listen((FileSystemEntity entity) async {
       // Print the path only if it represents a symlink.
-      FileSystemEntity.isLink(entity.path).then((isLink) {
-        if (isLink) print(entity.path);
-      });
+      var isLink = await FileSystemEntity.isLink(entity.path);
+      if (isLink) print(entity.path);
     });
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart
index 07e9454..48126e7 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart
@@ -2,20 +2,15 @@
 
 import 'dart:io';
 
-void main() {
+void main() async {
   // Get the system temp directory.
-  var systemTempDir = Directory.systemTemp;
+  var temp = await Directory.systemTemp.createTemp('my_temp_dir');
 
-  // Create a temporary directory with the system temp directory.
-  systemTempDir.createTemp('my_temp_dir').then((temp) {
+  // Generate a couple of paths.
+  var first = '${temp.path}${Platform.pathSeparator}first';
+  var second = '${temp.path}${Platform.pathSeparator}second';
 
-    // Generate a couple of paths.
-    var first = '${temp.path}${Platform.pathSeparator}first';
-    var second = '${temp.path}${Platform.pathSeparator}second';
-
-    // Create a symlink.
-    new Link(second).create(first).then((Link symLink) {
-      // Do something with the symlink.
-    });
-  });
+  // Create a symlink.
+  Link symLink = await new Link(second).create(first);
+  print(symLink);
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart
index 6e4dac1..b98b54a 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart
@@ -5,24 +5,20 @@ import 'dart:io';
 
 // Creates temporary directory inside the system temp directory, creates a
 // couple of paths in the created directory, and creates a symlink.
-Future<Link> createSymlink() {
-  return Directory.systemTemp.createTemp('my_temp_dir').then((temp) {
-    var first = '${temp.path}${Platform.pathSeparator}first';
-    var second = '${temp.path}${Platform.pathSeparator}second';
-    return new Link(second).create(first);
-  });
+Future<Link> createSymLink() async {
+  var temp = await Directory.systemTemp.createTemp('my_temp_dir');
+  var first = '${temp.path}${Platform.pathSeparator}first';
+  var second = '${temp.path}${Platform.pathSeparator}second';
+  return new Link(second).create(first);
 }
 
-void main() {
-  createSymlink()
-    .then((Link link) {
-      print(link.path); // Prints path that ends with 'second'.
-      link.target().then((String targetPath) {
-        // Do something with the targetPath that ends with 'first'.
-      })
-      // Catch any error generated by link.target().
-      .catchError((e) {
-        print(e.message);
-      });
-    });
+main() async {
+  try {
+    var link = await createSymLink();
+    print(link.path);
+    var targetPath = await link.target();
+    print(targetPath);
+  } catch(e) {
+    print(e.message);
+  }
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http/adding_custom_headers.dart b/dart_io_mini_samples/example/http/adding_custom_headers.dart
index 60b9920..876b321 100644
--- a/dart_io_mini_samples/example/http/adding_custom_headers.dart
+++ b/dart_io_mini_samples/example/http/adding_custom_headers.dart
@@ -8,18 +8,17 @@
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 
-void main() {
+void main() async {
   var url = 'https://api.github.com/users/dart-lang/repos';
-  http.get(url, headers : {'User-Agent':'Dart/1.0 (My Dart client)'})
-    .then((response) {
-      List<String> repos = JSON.decode(response.body);
-      var heading = 'Repository | Star count  | Fork count';
-      print(heading);
-      print(new List.filled(heading.length, '=').join());
-      for (var repo in repos) {
-        print("${repo['name']} | "
-              "${repo['stargazers_count']} | "
-              "${repo['forks_count']}");
-    }
-  });
+  var response = await http.get(url, headers : {'User-Agent':'Dart/1.0 (My Dart client)'});
+
+  List<String> repos = JSON.decode(response.body);
+  var heading = 'Repository | Star count  | Fork count';
+  print(heading);
+  print(new List.filled(heading.length, '=').join());
+  for (var repo in repos) {
+    print("${repo['name']} | "
+          "${repo['stargazers_count']} | "
+          "${repo['forks_count']}");
+  }
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http/getting_redirection_history.dart b/dart_io_mini_samples/example/http/getting_redirection_history.dart
index af45f42..17d56f5 100644
--- a/dart_io_mini_samples/example/http/getting_redirection_history.dart
+++ b/dart_io_mini_samples/example/http/getting_redirection_history.dart
@@ -7,15 +7,12 @@
 
 import "dart:io" show HttpClient, RedirectInfo;
 
-main() {
+main() async {
   var client = new HttpClient();
-  client.getUrl(Uri.parse('http://google.com'))
-    .then((request) => request.close())
-    .then((response) {
-      // Get a list of all redirects.
-      List<RedirectInfo> redirects = response.redirects;
-      redirects.forEach((redirect) {
-        print(redirect.location); // Prints 'http://www.google.com'.
-      });
-    });
+  var request = await client.getUrl(Uri.parse('http://google.com'));
+  var response = await request.close();
+  List<RedirectInfo> redirects = response.redirects;
+  redirects.forEach((redirect) {
+    print(redirect.location); // Prints 'http://www.google.com'.
+  });
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart b/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart
index e543519..f5f1692 100644
--- a/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart
+++ b/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart
@@ -8,12 +8,11 @@
 import 'package:http/http.dart' as http;
 import 'package:crypto/crypto.dart';
 
-void main() {
+main() async {
   var url = "https://www.dartlang.org/logos/dart-logo.png";
-  http.get(url).then((response) {
-    List<int> bytes = response.bodyBytes;
-    // Do something with the bytes. For example, convert to base64.
-    String base64 = CryptoUtils.bytesToBase64(bytes);
-    // ...
-  });
+  var response = await http.get(url);
+  List<int> bytes = response.bodyBytes;
+  // Do something with the bytes. For example, convert to base64.
+  String base64 = CryptoUtils.bytesToBase64(bytes);
+  print(base64);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http/getting_the_response_headers.dart b/dart_io_mini_samples/example/http/getting_the_response_headers.dart
index 9f4f94d..9cf1f9f 100644
--- a/dart_io_mini_samples/example/http/getting_the_response_headers.dart
+++ b/dart_io_mini_samples/example/http/getting_the_response_headers.dart
@@ -8,18 +8,17 @@
 
 import 'package:http/http.dart' as http;
 
-void main() {
+void main() async {
   var url = 'http://httpbin.org/';
-  http.get(url).then((response) {
+  var response = await http.get(url);
 
-    // Get the headers map.
-    print(response.headers.keys);
+  // Get the headers map.
+  print(response.headers.keys);
 
-    // Get header values.
-    print("access-control-allow-origin' = ${response.headers['access-control-allow-origin']}");
-    print("content-type = ${response.headers['content-type']}");
-    print("date = ${response.headers['date']}");
-    print("content-length = ${response.headers['content-length']}");
-    print("connection = ${response.headers['connection']}");
-  });
+  // Get header values.
+  print("access-control-allow-origin' = ${response.headers['access-control-allow-origin']}");
+  print("content-type = ${response.headers['content-type']}");
+  print("date = ${response.headers['date']}");
+  print("content-length = ${response.headers['content-length']}");
+  print("connection = ${response.headers['connection']}");
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart b/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart
index 8c21b06..24e32aa 100644
--- a/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart
+++ b/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart
@@ -2,12 +2,7 @@
 // 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.
 
-/// An HTTP request may return a response, or it may generate an error. Since
-/// both the response and the error are produced asychronously, you should
-/// register callbacks with chained `then()` and `catchError()` calls. The
-/// response is handled by the `then()` callback, and the error is handled by
-/// the `catchError()` callback.
-
+/// An HTTP request may return a response, or it may generate an error. 
 import 'package:http/http.dart' as http;
 
 handleSuccess(http.Response response) {
@@ -20,8 +15,12 @@ handleFailure(error) {
   print(error.message);
 }
 
-void main() {
-  http.get("http://some_bogus_website.org")
-    .then(handleSuccess)
-    .catchError(handleFailure);
+main() async {
+  try {
+  	var response = await http.get("http://some_bogus_website.org");
+  	handleSuccess(response);
+  }
+  catch(e) {
+  	handleFailure(e);
+  }
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http/making_a_get_request.dart b/dart_io_mini_samples/example/http/making_a_get_request.dart
index 9d181ca..8792315 100644
--- a/dart_io_mini_samples/example/http/making_a_get_request.dart
+++ b/dart_io_mini_samples/example/http/making_a_get_request.dart
@@ -6,10 +6,9 @@
 
 import 'package:http/http.dart' as http;
 
-void main() {
+void main() async {
   var url = 'http://httpbin.org/';
-  http.get(url).then((response) {
-    print("Response status: ${response.statusCode}");
-    print("Response body: ${response.body}");
-  });
+  var response = await http.get(url);
+  print("Response status: ${response.statusCode}");
+  print("Response body: ${response.body}");
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http/making_a_post_request.dart b/dart_io_mini_samples/example/http/making_a_post_request.dart
index 13bbd9d..b578d60 100644
--- a/dart_io_mini_samples/example/http/making_a_post_request.dart
+++ b/dart_io_mini_samples/example/http/making_a_post_request.dart
@@ -6,10 +6,9 @@
 
 import 'package:http/http.dart' as http;
 
-void main() {
+void main() async {
   var url = 'http://httpbin.org/post';
-  http.post(url, body: 'name=doodle&color=blue').then((response) {
-    print("Response status: ${response.statusCode}");
-    print("Response body: ${response.body}");
-  });
+  var response = await http.post(url, body: 'name=doodle&color=blue');
+  print("Response status: ${response.statusCode}");
+  print("Response body: ${response.body}");
 }
diff --git a/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart b/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
index d482b68..47c5af3 100644
--- a/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
+++ b/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
@@ -18,16 +18,12 @@ printResponseBody(response) {
   print('...\n');
 }
 
-void main() {
-   var url = 'http://www.google.com/';
-   var client = new http.Client();
-   client.get('${url}/search')
-       .then((response) {
-         printResponseBody(response);
-         return client.get('${url}/doodles');
-        })
-       .then(printResponseBody)
-
-       // Close the connection when done.
-       .whenComplete(client.close);
+void main() async {
+  var url = 'http://www.google.com/';
+  var client = new http.Client();
+  var response = await client.get('${url}/search');
+  printResponseBody(response);
+  response = await client.get('${url}/doodles');
+  printResponseBody(response);
+  client.close();
 }
diff --git a/dart_io_mini_samples/example/http/reading_the_response_body.dart b/dart_io_mini_samples/example/http/reading_the_response_body.dart
index cb09801..ad10da0 100644
--- a/dart_io_mini_samples/example/http/reading_the_response_body.dart
+++ b/dart_io_mini_samples/example/http/reading_the_response_body.dart
@@ -7,6 +7,6 @@
 
 import 'package:http/http.dart' as http;
 
-void main() {
-  http.read("http://www.google.com/").then(print);
+main() async {
+  print(await http.read("http://www.google.com/"));
 }
diff --git a/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart b/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
index ef2b232..c61fbdc 100644
--- a/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
+++ b/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
@@ -8,14 +8,13 @@
 
 import 'dart:io';
 
-void main() {
-  HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080).then((server) {
-    print("Serving at ${server.address}:${server.port}");
-    server.listen((HttpRequest request) {
-      request.response
-        ..headers.contentType = new ContentType("text", "plain", charset: "utf-8")
-        ..write('Hello, world')
-        ..close();
-    });
+main() async {
+  var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
+  print("Serving at ${server.address}:${server.port}");
+  server.listen((HttpRequest request) {
+    request.response
+      ..headers.contentType = new ContentType("text", "plain", charset: "utf-8")
+      ..write('Hello, world')
+      ..close();
   });
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http_server/listing_directory_contents.dart b/dart_io_mini_samples/example/http_server/listing_directory_contents.dart
index 690fd92..1553eaa 100644
--- a/dart_io_mini_samples/example/http_server/listing_directory_contents.dart
+++ b/dart_io_mini_samples/example/http_server/listing_directory_contents.dart
@@ -12,14 +12,13 @@ library simple_http_server;
 import 'dart:io';
 import 'package:http_server/http_server.dart' show VirtualDirectory;
 
-void main() {
+main() async {
   final MY_HTTP_ROOT_PATH = Platform.script.resolve('web').toFilePath();
   final virDir = new VirtualDirectory(MY_HTTP_ROOT_PATH)
     ..allowDirectoryListing = true;
 
-  HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080).then((server) {
-    server.listen((request) {
-      virDir.serveRequest(request);
-    });
+  var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
+  server.listen((request) {
+    virDir.serveRequest(request);
   });
 }
diff --git a/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart b/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
index 1a559fb..db34f7d 100644
--- a/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
+++ b/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
@@ -35,12 +35,11 @@ serveNotFound(req) {
   req.response.close();
 }
 
-void main() {
-  HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080).then((server) {
-    var router = new Router(server)
-      // Associate callbacks with URLs.
-      ..serve(postsUrl, method: 'GET').listen(servePosts)
-      ..serve(postUrl, method: 'GET').listen(servePost)
-      ..defaultStream.listen(serveNotFound);
-  });
+void main() async {
+  var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
+  var router = new Router(server)
+  // Associate callbacks with URLs.
+  ..serve(postsUrl, method: 'GET').listen(servePosts)
+  ..serve(postUrl, method: 'GET').listen(servePost)
+  ..defaultStream.listen(serveNotFound);
 }
diff --git a/dart_io_mini_samples/example/http_server/serving_a_404.dart b/dart_io_mini_samples/example/http_server/serving_a_404.dart
index 25bed97..e08965c 100644
--- a/dart_io_mini_samples/example/http_server/serving_a_404.dart
+++ b/dart_io_mini_samples/example/http_server/serving_a_404.dart
@@ -8,24 +8,23 @@
 import 'dart:io';
 import 'package:http_server/http_server.dart' as http_server;
 
-void errorPageHandler(HttpRequest request) {
+errorPageHandler(HttpRequest request) {
   request.response
-      ..statusCode = HttpStatus.NOT_FOUND
-      ..write('Not found')
-      ..close();
+    ..statusCode = HttpStatus.NOT_FOUND
+    ..write('Not found')
+    ..close();
 }
 
-void main() {
+main() async {
   var buildPath = Platform.script.resolve('web').toFilePath();
 
   var virDir = new http_server.VirtualDirectory(buildPath)
     ..allowDirectoryListing = true
     ..errorPageHandler = errorPageHandler;
 
-  HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080).then((server) {
-    server.listen((request) {
-      virDir.serveRequest(request);
-    });
+  var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
+  server.listen((request) {
+    virDir.serveRequest(request);
   });
 }
 
diff --git a/dart_io_mini_samples/example/http_server/serving_index_html.dart b/dart_io_mini_samples/example/http_server/serving_index_html.dart
index 3f6dbac..f420ff1 100644
--- a/dart_io_mini_samples/example/http_server/serving_index_html.dart
+++ b/dart_io_mini_samples/example/http_server/serving_index_html.dart
@@ -13,19 +13,18 @@ import 'package:http_server/http_server.dart' show VirtualDirectory;
 
 VirtualDirectory virDir;
 
-void directoryHandler(dir, request) {
+directoryHandler(dir, request) {
   var indexUri = new Uri.file(dir.path).resolve('index.html');
   virDir.serveFile(new File(indexUri.toFilePath()), request);
 }
 
-void main() {
+main() async {
   virDir = new VirtualDirectory(Platform.script.resolve('web').toFilePath())
     ..allowDirectoryListing = true
     ..directoryHandler = directoryHandler;
 
-  HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080).then((server) {
-    server.listen((request) {
-      virDir.serveRequest(request);
-    });
+  var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
+  server.listen((request) {
+    virDir.serveRequest(request);
   });
 }
diff --git a/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart b/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart
index 8426b6e..57f8047 100644
--- a/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart
+++ b/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart
@@ -9,11 +9,9 @@
 
 import 'dart:io';
 
-main() {
-  Process.start('ls', ['-l']).then((process) {
-    // Get the exit code from the new process.
-    process.exitCode.then((exitCode) {
-      print('exit code: $exitCode'); // Prints 'exit code: 1'.
-    });
-  });
+main() async {
+  var process = await Process.start('ls', ['-l']);
+  // Get the exit code from the new process.
+  var exitCode = await process.exitCode;
+  print('exit code: $exitCode');
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart b/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart
index 2af6185..a26e3be 100644
--- a/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart
+++ b/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart
@@ -7,9 +7,8 @@
 
 import 'dart:io';
 
-main() {
+main() async {
   // List all files in the current directory in UNIX-like operating systems.
-  Process.run('ls', ['-l']).then((ProcessResult results) {
-    print(results.stdout);
-  });
+  var results = await Process.run('ls', ['-l']);
+  print(results.stdout);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart b/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
index eb4e491..e29d0d2 100644
--- a/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
+++ b/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
@@ -10,14 +10,13 @@ import 'package:path/path.dart' as path;
 
 import 'dart:io';
 
-void main() {
+void main() async {
   // Create dir/ and dir/file.txt in the system temp directory.
-  new File('${Directory.systemTemp.path}/dir/myFile.txt').create(recursive: true)
-    // The created file is returned as a Future.
-    .then((file) {
-      print(path.basename(file.path)); // Prints 'file.txt'.
-      print(path.dirname(file.path));  // Prints path ending with 'dir'.
-      print(path.basenameWithoutExtension(file.path)); // Prints 'myFile'.
-      print(path.extension(file.path)); // Prints '.txt'.
-  });
+  var file = await new File('${Directory.systemTemp.path}/dir/myFile.txt').create(recursive: true);
+
+  print(path.basename(file.path)); // Prints 'file.txt'.
+  print(path.dirname(file.path));  // Prints path ending with 'dir'.
+  print(path.basenameWithoutExtension(file.path)); // Prints 'myFile'.
+  print(path.extension(file.path)); // Prints '.txt'.
+
 }
diff --git a/dart_io_mini_samples/example/sockets/using_serversockets_client.dart b/dart_io_mini_samples/example/sockets/using_serversockets_client.dart
index 497fbaa..8b446cf 100644
--- a/dart_io_mini_samples/example/sockets/using_serversockets_client.dart
+++ b/dart_io_mini_samples/example/sockets/using_serversockets_client.dart
@@ -8,9 +8,8 @@
 
 import 'dart:io';
 
-main() {
-  Socket.connect('127.0.0.1', 4041).then((socket) {
-    print(socket.runtimeType);
-    socket.write('Hello, World!');
-  });
+main() async {
+  var socket = await Socket.connect('127.0.0.1', 4041);
+  print(socket.runtimeType);
+  socket.write('Hello, World!');
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/sockets/using_serversockets_server.dart b/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
index f5a96c0..9a881a3 100644
--- a/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
+++ b/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
@@ -8,12 +8,10 @@
 import 'dart:io';
 import 'dart:convert';
 
-main() {
-  ServerSocket.bind('127.0.0.1', 4041)
-    .then((serverSocket) {
-      print('connected');
-      serverSocket.listen((socket) {
-        socket.transform(UTF8.decoder).listen(print);
-      });
-    });
+main() async {
+  var serverSocket = await ServerSocket.bind('127.0.0.1', 4041);
+  print('connected');
+  serverSocket.listen((socket) {
+  	socket.transform(UTF8.decoder).listen(print);
+  });
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/websockets/using_websockets_client.dart b/dart_io_mini_samples/example/websockets/using_websockets_client.dart
index 4d31fdd..6dca789 100644
--- a/dart_io_mini_samples/example/websockets/using_websockets_client.dart
+++ b/dart_io_mini_samples/example/websockets/using_websockets_client.dart
@@ -7,8 +7,7 @@
 
 import 'dart:io';
 
-main() {
-  WebSocket.connect('ws://127.0.0.1:4040/ws').then((socket) {
-    socket.add('Hello, World!');
-  });
+main() async {
+  var socket = await WebSocket.connect('ws://127.0.0.1:4040/ws');
+  socket.add('Hello, World!');
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/websockets/using_websockets_server.dart b/dart_io_mini_samples/example/websockets/using_websockets_server.dart
index 1de538a..39494ea 100644
--- a/dart_io_mini_samples/example/websockets/using_websockets_server.dart
+++ b/dart_io_mini_samples/example/websockets/using_websockets_server.dart
@@ -13,16 +13,14 @@ handleMsg(msg) {
 }
 
 main() {
-  runZoned(() {
-    HttpServer.bind('127.0.0.1', 4040).then((server) {
-      server.listen((HttpRequest req) {
-        if (req.uri.path == '/ws') {
-          // Upgrade a HttpRequest to a WebSocket connection.
-          WebSocketTransformer.upgrade(req).then((socket) {
-            socket.listen(handleMsg);
-          });
-        }
-      });
+  runZoned(() async {
+    var server = await HttpServer.bind('127.0.0.1', 4040);
+    server.listen((HttpRequest req) {
+      if (req.uri.path == '/ws') {
+        // Upgrade a HttpRequest to a WebSocket connection. 
+        var socket = await WebSocketTransformer.upgrade(req);
+        socket.listen(handleMsg);
+      }
     });
   },
   onError: (e) => print("An error occurred."));
diff --git a/deferred_loading_samples/deferred_loading_example/bin/main.dart b/deferred_loading_samples/deferred_loading_example/bin/main.dart
index 15b64a2..a357516 100644
--- a/deferred_loading_samples/deferred_loading_example/bin/main.dart
+++ b/deferred_loading_samples/deferred_loading_example/bin/main.dart
@@ -1,5 +1,6 @@
 import 'package:deferred_loading_example/hello.dart' deferred as hello;
 
-main() {
-  hello.loadLibrary().then((_) => hello.printGreeting());
-}
+main() async {
+  await hello.loadLibrary();
+  hello.printGreeting();
+}
\ No newline at end of file
diff --git a/deferred_loading_samples/deferred_loading_example/pubspec.yaml b/deferred_loading_samples/deferred_loading_example/pubspec.yaml
index 82e507f..4f909f8 100644
--- a/deferred_loading_samples/deferred_loading_example/pubspec.yaml
+++ b/deferred_loading_samples/deferred_loading_example/pubspec.yaml
@@ -1,2 +1,2 @@
-name: test
+name: deferred_loading_example
 description: A sample web application that loads a library lazily.
diff --git a/deferred_loading_samples/lazyloader/web/main.dart b/deferred_loading_samples/lazyloader/web/main.dart
index 0a6921b..f4c58f2 100644
--- a/deferred_loading_samples/lazyloader/web/main.dart
+++ b/deferred_loading_samples/lazyloader/web/main.dart
@@ -4,34 +4,37 @@ import "package:lazyloader/breakfast.dart" deferred as breakfast;
 import "package:lazyloader/lunch.dart"     deferred as lunch;
 import "package:lazyloader/dinner.dart"    deferred as dinner;
 
-main() {
+main() async {
   querySelector('#show-breakfast').onClick.listen((_) {
-    breakfast.loadLibrary().then(onBreakfastLoaded);
+    await breakfast.loadLibrary();
+    onBreakfastLoaded();
   });
   querySelector('#show-lunch').onClick.listen((_) {
-    lunch.loadLibrary().then(onLunchLoaded);
+    await lunch.loadLibrary();
+    onLunchLoaded();
   });
   querySelector('#show-dinner').onClick.listen((_) {
-    dinner.loadLibrary().then(onDinnerLoaded);
+    await dinner.loadLibrary();
+    onDinnerLoaded();
   });
 }
 
-void onBreakfastLoaded(e) {
+onBreakfastLoaded() {
   print('breakfast loaded');
   changeMenu(breakfast.menu);
 }
 
-void onLunchLoaded(e) {
+onLunchLoaded() {
   print('lunch loaded');
   changeMenu(lunch.menu);
 }
 
-void onDinnerLoaded(e) {
+onDinnerLoaded() {
   print('dinner loaded');
   changeMenu(dinner.menu);
 }
 
-void changeMenu(String menu) {
+changeMenu(String menu) {
   var el = querySelector("#text_id");
   el.text = menu;
 }

From ab05188494b116850788a76f74bebc4ad15d6918 Mon Sep 17 00:00:00 2001
From: Damon Douglas <damon@hospiq.com>
Date: Wed, 12 Aug 2015 21:50:58 -0400
Subject: [PATCH 2/3] Fix #92: Remove void from main. Implement await for
 Streams.

---
 .../deleting_a_file_directory_or_symlink.dart |  2 +-
 .../directories/creating_a_directory.dart     |  2 +-
 .../creating_a_temporary_directory.dart       |  2 +-
 .../listing_the_contents_of_a_directory.dart  |  9 ++++----
 .../files/creating_a_file.dart                |  2 +-
 .../files/reading_a_file_as_lines.dart        |  2 +-
 .../files/reading_a_file_using_a_stream.dart  | 20 ++++++++++--------
 .../files/writing_a_string_to_a_file.dart     |  2 +-
 .../writing_to_a_file_using_a_stream.dart     |  2 +-
 ...nding_the_type_of_a_filesystem_object.dart | 21 ++++++++++---------
 .../getting_the_parent_directory.dart         | 11 +++++-----
 .../renaming_a_file_directory_or_symlink.dart |  2 +-
 ...ecking_if_a_path_represents_a_symlink.dart | 15 ++++++-------
 .../symlinks/creating_a_symlink.dart          |  2 +-
 .../example/http/adding_custom_headers.dart   |  2 +-
 .../http/getting_the_response_headers.dart    |  2 +-
 .../example/http/making_a_get_request.dart    |  2 +-
 .../example/http/making_a_post_request.dart   |  2 +-
 ..._multiple_requests_to_the_same_server.dart |  2 +-
 ...mplementing_a_Hello_World_http_server.dart | 12 +++++------
 .../listing_directory_contents.dart           |  4 +---
 ...outing_requests_based_on_url_patterns.dart |  2 +-
 .../example/http_server/serving_a_404.dart    |  8 ++-----
 .../http_server/serving_index_html.dart       |  4 +---
 .../paths/calculating_relative_paths.dart     |  2 +-
 .../converting_between_a_uri_and_a_path.dart  |  2 +-
 ...getting_information_about_a_file_path.dart |  2 +-
 ...th_separator_for_the_current_platform.dart |  2 +-
 .../example/paths/joining_paths.dart          |  2 +-
 .../paths/parsing_a_path_into_components.dart |  2 +-
 .../getting_environment_variables.dart        |  2 +-
 ...nformation_about_the_script_being_run.dart |  2 +-
 .../identifying_the_operating_system.dart     |  2 +-
 .../sockets/using_serversockets_server.dart   |  4 +---
 .../websockets/using_websockets_server.dart   |  4 ++--
 .../generate_md_for_dartlang.dart             |  2 +-
 .../lazyloader/web/main.dart                  |  8 +++----
 37 files changed, 81 insertions(+), 89 deletions(-)

diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
index 1072ef2..5927c0f 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
@@ -8,7 +8,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
 
   // Create a temporary directory.
   var dir = await Directory.systemTemp.createTemp('my_temp_dir');
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
index 2e12799..6a801dc 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
@@ -8,7 +8,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
   // Creates dir/ and dir/subdir/.
   var directory = await new Directory('dir/subdir');
   print(directory.path);
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart
index cd4b5c2..6ac5526 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_temporary_directory.dart
@@ -8,7 +8,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
   var directory = await Directory.systemTemp.createTemp('my_temp_dir');
   print(directory.path);
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart
index 960ceaa..b8f21da 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart
@@ -8,15 +8,14 @@
 /// `false` (default is `true`).
 
 import 'dart:io';
+import 'dart:async'; // Import not needed but added here to explicitly assign type for clarity below.
 
-void main() {
+main() async {
   // Get the system temp directory.
   var systemTempDir = Directory.systemTemp;
 
   // List directory contents, recursing into sub-directories, but not following
   // symbolic links.
-  systemTempDir.list(recursive: true, followLinks: false)
-    .listen((FileSystemEntity entity) {
-      print(entity.path);
-    });
+  Stream<FileSystemEntity> entityList = systemTempDir.list(recursive: true, followLinks: false);
+  await for (FileSystemEntity entity in entityList) print(entity.path);
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
index d4b4fbf..dcb5654 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
@@ -8,7 +8,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
 
   // Get the system temp directory.
   var systemTempDir = Directory.systemTemp;
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
index 3fcadf4..18770be 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
@@ -6,7 +6,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
   List<String> lines = await new File('file.txt').readAsLines();
   lines.forEach((String line) => print(line));
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart
index ea7a3cc..05a93b4 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart
@@ -13,19 +13,21 @@ import 'dart:io';
 import 'dart:convert';
 import 'dart:async';
 
-main() {
+main() async {
   final file = new File('file.txt');
   Stream<List<int>> inputStream = file.openRead();
 
-  inputStream
+  Stream<String> lines = inputStream
     // Decode to UTF8.
     .transform(UTF8.decoder)
     // Convert stream to individual lines.
-    .transform(new LineSplitter())
-    // Process results.
-    .listen((String line) {
-        print('$line: ${line.length} bytes');
-      },
-      onDone: () { print('File is now closed.'); },
-      onError: (e) { print(e.toString()); });
+    .transform(new LineSplitter());
+
+  try {
+    await for (String line in lines) print('$line: ${line.length} bytes');
+  } catch(e) {
+    print(e.toString());
+  }
+
+  print('File is now closed.');
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
index 3f70ea4..e7379b6 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
@@ -7,7 +7,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
   final filename = 'file.txt';
   var file = await new File(filename).writeAsString('some content');
   print("Content written to $file");
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart
index b4f1dbf..460aae3 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart
@@ -9,7 +9,7 @@
 
 import 'dart:io';
 
-void main() {
+main() {
   var file = new File('file.txt');
   var sink = file.openWrite();
   sink.write('FILE ACCESSED ${new DateTime.now()}\n');
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
index 9c6ac79..ee3f14d 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
@@ -6,16 +6,18 @@
 /// object. This method is inherited by File, Directory, and Link.
 
 import 'dart:io';
+import 'dart:async'; // Import not needed but added here to explicitly assign type for clarity below.
 
-void main() {
+main() async {
   // List the contents of the system temp directory.
-  Directory.systemTemp.list(recursive: true, followLinks: false)
-    .listen((FileSystemEntity entity) async {
-      // Get the type of the FileSystemEntity, apply the appropiate label, and
-      // print the entity path.
-      FileSystemEntityType type = await FileSystemEntity.type(entity.path);
-      
-      String label;
+  Stream<FileSystemEntity> entityList = Directory.systemTemp.list(recursive: true, followLinks: false);
+
+  await for (FileSystemEntity entity in entityList) {
+    // Get the type of the FileSystemEntity, apply the appropiate label, and
+    // print the entity path.
+    FileSystemEntityType type = await FileSystemEntity.type(entity.path);
+
+    String label;
       switch (type) {
         case FileSystemEntityType.DIRECTORY:
           label = 'D';
@@ -30,6 +32,5 @@ void main() {
           label = 'UNKNOWN';
       }
       print('$label: ${entity.path}');
-
-    });
+  }
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart
index 49b3115..706d79b 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart
@@ -7,12 +7,11 @@
 /// and Link.
 
 import 'dart:io';
+import 'dart:async'; // Import not needed but added here to explicitly assign type for clarity below.
 
-void main() {
+main() async {
   // List the contents of the system temp directory.
-  Directory.systemTemp.list(recursive: true, followLinks: false)
-    .listen((FileSystemEntity entity) {
-      // Print the path of the parent of each file, directory, and symlink.
-      print(entity.parent.path);
-    });
+  Stream<FileSystemEntity> entityList = Directory.systemTemp.list(recursive: true, followLinks: false);
+
+  await for (FileSystemEntity entity in entityList) print(entity.parent.path);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
index 84a1043..dfe8f34 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
@@ -8,7 +8,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
   // Get the system temp directory.
   var systemTempDir = Directory.systemTemp;
 
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
index e5223af..3547dbd 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
@@ -2,16 +2,17 @@
 /// a symlink.
 
 import 'dart:io';
+import 'dart:async'; // Import not needed but added here to explicitly assign type for clarity below.
 
-void main() {
+main() async {
   // Get the system temp directory.
   var systemTempDir = Directory.systemTemp;
 
   // List the contents of the system temp directory.
-  systemTempDir.list(recursive: true, followLinks: false)
-    .listen((FileSystemEntity entity) async {
-      // Print the path only if it represents a symlink.
-      var isLink = await FileSystemEntity.isLink(entity.path);
-      if (isLink) print(entity.path);
-    });
+  Stream<FileSystemEntity> entityList = systemTempDir.list(recursive: true, followLinks: false); 
+  await for (FileSystemEntity entity in entityList) {
+  	// Print the path only if it represents a symlink.
+   	var isLink = await FileSystemEntity.isLink(entity.path);
+  	if (isLink) print(entity.path);
+  }
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart
index 48126e7..3cdc994 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/creating_a_symlink.dart
@@ -2,7 +2,7 @@
 
 import 'dart:io';
 
-void main() async {
+main() async {
   // Get the system temp directory.
   var temp = await Directory.systemTemp.createTemp('my_temp_dir');
 
diff --git a/dart_io_mini_samples/example/http/adding_custom_headers.dart b/dart_io_mini_samples/example/http/adding_custom_headers.dart
index 876b321..a824c4b 100644
--- a/dart_io_mini_samples/example/http/adding_custom_headers.dart
+++ b/dart_io_mini_samples/example/http/adding_custom_headers.dart
@@ -8,7 +8,7 @@
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 
-void main() async {
+main() async {
   var url = 'https://api.github.com/users/dart-lang/repos';
   var response = await http.get(url, headers : {'User-Agent':'Dart/1.0 (My Dart client)'});
 
diff --git a/dart_io_mini_samples/example/http/getting_the_response_headers.dart b/dart_io_mini_samples/example/http/getting_the_response_headers.dart
index 9cf1f9f..ad1d1ad 100644
--- a/dart_io_mini_samples/example/http/getting_the_response_headers.dart
+++ b/dart_io_mini_samples/example/http/getting_the_response_headers.dart
@@ -8,7 +8,7 @@
 
 import 'package:http/http.dart' as http;
 
-void main() async {
+main() async {
   var url = 'http://httpbin.org/';
   var response = await http.get(url);
 
diff --git a/dart_io_mini_samples/example/http/making_a_get_request.dart b/dart_io_mini_samples/example/http/making_a_get_request.dart
index 8792315..268c5d0 100644
--- a/dart_io_mini_samples/example/http/making_a_get_request.dart
+++ b/dart_io_mini_samples/example/http/making_a_get_request.dart
@@ -6,7 +6,7 @@
 
 import 'package:http/http.dart' as http;
 
-void main() async {
+main() async {
   var url = 'http://httpbin.org/';
   var response = await http.get(url);
   print("Response status: ${response.statusCode}");
diff --git a/dart_io_mini_samples/example/http/making_a_post_request.dart b/dart_io_mini_samples/example/http/making_a_post_request.dart
index b578d60..3f9fc8f 100644
--- a/dart_io_mini_samples/example/http/making_a_post_request.dart
+++ b/dart_io_mini_samples/example/http/making_a_post_request.dart
@@ -6,7 +6,7 @@
 
 import 'package:http/http.dart' as http;
 
-void main() async {
+main() async {
   var url = 'http://httpbin.org/post';
   var response = await http.post(url, body: 'name=doodle&color=blue');
   print("Response status: ${response.statusCode}");
diff --git a/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart b/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
index 47c5af3..f0508f1 100644
--- a/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
+++ b/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
@@ -18,7 +18,7 @@ printResponseBody(response) {
   print('...\n');
 }
 
-void main() async {
+main() async {
   var url = 'http://www.google.com/';
   var client = new http.Client();
   var response = await client.get('${url}/search');
diff --git a/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart b/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
index c61fbdc..93e65fc 100644
--- a/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
+++ b/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
@@ -2,19 +2,19 @@
 // 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.
 
-/// Use `HttpServer.bind()` method to bind to a port and the HttpServer
-/// `listen()` method to listen for connections.  Respond to an `HttpRequest`
-/// using the `response` property.
+/// Use `HttpServer.bind()` method to bind to a port.
+/// The await for listens for connections.
+/// Respond to an `HttpRequest` using the `response` property.
 
 import 'dart:io';
 
 main() async {
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
   print("Serving at ${server.address}:${server.port}");
-  server.listen((HttpRequest request) {
-    request.response
+  await for (HttpRequest request in server) {
+  	request.response
       ..headers.contentType = new ContentType("text", "plain", charset: "utf-8")
       ..write('Hello, world')
       ..close();
-  });
+  }
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http_server/listing_directory_contents.dart b/dart_io_mini_samples/example/http_server/listing_directory_contents.dart
index 1553eaa..9b24c38 100644
--- a/dart_io_mini_samples/example/http_server/listing_directory_contents.dart
+++ b/dart_io_mini_samples/example/http_server/listing_directory_contents.dart
@@ -18,7 +18,5 @@ main() async {
     ..allowDirectoryListing = true;
 
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
-  server.listen((request) {
-    virDir.serveRequest(request);
-  });
+  await for (var request in server) virDir.serveRequest(request);
 }
diff --git a/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart b/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
index db34f7d..223630d 100644
--- a/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
+++ b/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
@@ -35,7 +35,7 @@ serveNotFound(req) {
   req.response.close();
 }
 
-void main() async {
+main() async {
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
   var router = new Router(server)
   // Associate callbacks with URLs.
diff --git a/dart_io_mini_samples/example/http_server/serving_a_404.dart b/dart_io_mini_samples/example/http_server/serving_a_404.dart
index e08965c..4e00f0f 100644
--- a/dart_io_mini_samples/example/http_server/serving_a_404.dart
+++ b/dart_io_mini_samples/example/http_server/serving_a_404.dart
@@ -23,9 +23,5 @@ main() async {
     ..errorPageHandler = errorPageHandler;
 
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
-  server.listen((request) {
-    virDir.serveRequest(request);
-  });
-}
-
-
+  await for (var request in server) virDir.serveRequest(request);
+}
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/http_server/serving_index_html.dart b/dart_io_mini_samples/example/http_server/serving_index_html.dart
index f420ff1..3b3570b 100644
--- a/dart_io_mini_samples/example/http_server/serving_index_html.dart
+++ b/dart_io_mini_samples/example/http_server/serving_index_html.dart
@@ -24,7 +24,5 @@ main() async {
     ..directoryHandler = directoryHandler;
 
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
-  server.listen((request) {
-    virDir.serveRequest(request);
-  });
+  await for (var request in server) virDir.serveRequest(request);
 }
diff --git a/dart_io_mini_samples/example/paths/calculating_relative_paths.dart b/dart_io_mini_samples/example/paths/calculating_relative_paths.dart
index bf2c8ac..b877e47 100644
--- a/dart_io_mini_samples/example/paths/calculating_relative_paths.dart
+++ b/dart_io_mini_samples/example/paths/calculating_relative_paths.dart
@@ -10,7 +10,7 @@
 import 'dart:io' show Directory;
 import 'package:path/path.dart' as path;
 
-void main() {
+main() {
   // The path from the current directory to the system temp directory.
   print(path.relative(Directory.systemTemp.path));
 
diff --git a/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart b/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart
index 92998f8..a516d24 100644
--- a/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart
+++ b/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart
@@ -7,7 +7,7 @@
 
 import 'package:path/path.dart' as path;
 
-void main() {
+main() {
   var uri = path.toUri('http://dartlang.org/samples');
   print(path.fromUri(uri)); // Prints 'http:/dartlang.org/samples'.
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart b/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
index e29d0d2..90b251b 100644
--- a/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
+++ b/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
@@ -10,7 +10,7 @@ import 'package:path/path.dart' as path;
 
 import 'dart:io';
 
-void main() async {
+main() async {
   // Create dir/ and dir/file.txt in the system temp directory.
   var file = await new File('${Directory.systemTemp.path}/dir/myFile.txt').create(recursive: true);
 
diff --git a/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart b/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart
index e523aa1..aeca37b 100644
--- a/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart
+++ b/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart
@@ -9,7 +9,7 @@
 import 'dart:io' show Platform;
 import 'package:path/path.dart' as path;
 
-void main() {
+main() {
   // Prints  '\' on Windows and '/' on other platforms.
   print(Platform.pathSeparator);
 
diff --git a/dart_io_mini_samples/example/paths/joining_paths.dart b/dart_io_mini_samples/example/paths/joining_paths.dart
index a3a67a5..e11452d 100644
--- a/dart_io_mini_samples/example/paths/joining_paths.dart
+++ b/dart_io_mini_samples/example/paths/joining_paths.dart
@@ -8,7 +8,7 @@
 
 import 'package:path/path.dart' as path;
 
-void main() {
+main() {
   var newPath = path.join('/Users/shailen', 'dart/projects');
   print(newPath); // Prints '/Users.shailen/dart/projects'.
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart b/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart
index 1beb622..3993232 100644
--- a/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart
+++ b/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart
@@ -7,7 +7,7 @@
 
 import 'package:path/path.dart' as path;
 
-void main() {
+main() {
   print(path.split('/Users/shailen')); // Prints ['/', 'Users', 'shailen'].
 
   // Windows example.
diff --git a/dart_io_mini_samples/example/platform/getting_environment_variables.dart b/dart_io_mini_samples/example/platform/getting_environment_variables.dart
index 14bf1cf..37ed47c 100644
--- a/dart_io_mini_samples/example/platform/getting_environment_variables.dart
+++ b/dart_io_mini_samples/example/platform/getting_environment_variables.dart
@@ -6,7 +6,7 @@
 
 import 'dart:io' show Platform;
 
-void main() {
+main() {
   Map<String, String> envVars = Platform.environment;
   print(envVars['PATH']);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart b/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart
index 3d30e57..f5ab395 100644
--- a/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart
+++ b/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart
@@ -7,7 +7,7 @@
 
 import 'dart:io' show Platform;
 
-void main() {
+main() {
   // Get the URI of the script being run.
   var uri = Platform.script;
   print(uri); // Prints something like '/Users/shailentuli/workspace/...'.
diff --git a/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart b/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart
index 91fa6cc..6213a50 100644
--- a/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart
+++ b/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart
@@ -8,7 +8,7 @@
 
 import 'dart:io' show Platform, stdout;
 
-void main() {
+main() {
   // Get the operating system as a string.
   String os = Platform.operatingSystem;
 
diff --git a/dart_io_mini_samples/example/sockets/using_serversockets_server.dart b/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
index 9a881a3..b8e6a2c 100644
--- a/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
+++ b/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
@@ -11,7 +11,5 @@ import 'dart:convert';
 main() async {
   var serverSocket = await ServerSocket.bind('127.0.0.1', 4041);
   print('connected');
-  serverSocket.listen((socket) {
-  	socket.transform(UTF8.decoder).listen(print);
-  });
+  await for (var socket in serverSocket) socket.transform(UTF8.decoder).listen(print);
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/example/websockets/using_websockets_server.dart b/dart_io_mini_samples/example/websockets/using_websockets_server.dart
index 39494ea..e56a139 100644
--- a/dart_io_mini_samples/example/websockets/using_websockets_server.dart
+++ b/dart_io_mini_samples/example/websockets/using_websockets_server.dart
@@ -15,13 +15,13 @@ handleMsg(msg) {
 main() {
   runZoned(() async {
     var server = await HttpServer.bind('127.0.0.1', 4040);
-    server.listen((HttpRequest req) {
+    await for (HttpRequest req in server) {
       if (req.uri.path == '/ws') {
         // Upgrade a HttpRequest to a WebSocket connection. 
         var socket = await WebSocketTransformer.upgrade(req);
         socket.listen(handleMsg);
       }
-    });
+    }
   },
   onError: (e) => print("An error occurred."));
 }
\ No newline at end of file
diff --git a/dart_io_mini_samples/generate_md_for_dartlang.dart b/dart_io_mini_samples/generate_md_for_dartlang.dart
index 5082c48..208f301 100644
--- a/dart_io_mini_samples/generate_md_for_dartlang.dart
+++ b/dart_io_mini_samples/generate_md_for_dartlang.dart
@@ -33,7 +33,7 @@ has-permalinks: true
 
 ''';
 
-void main() {
+main() {
   print(fileHeader);
 
   // RegExp to match a markdown link such as [Google](http://google.com)
diff --git a/deferred_loading_samples/lazyloader/web/main.dart b/deferred_loading_samples/lazyloader/web/main.dart
index f4c58f2..48762cd 100644
--- a/deferred_loading_samples/lazyloader/web/main.dart
+++ b/deferred_loading_samples/lazyloader/web/main.dart
@@ -4,16 +4,16 @@ import "package:lazyloader/breakfast.dart" deferred as breakfast;
 import "package:lazyloader/lunch.dart"     deferred as lunch;
 import "package:lazyloader/dinner.dart"    deferred as dinner;
 
-main() async {
-  querySelector('#show-breakfast').onClick.listen((_) {
+main() {
+  querySelector('#show-breakfast').onClick.listen((_) async {
     await breakfast.loadLibrary();
     onBreakfastLoaded();
   });
-  querySelector('#show-lunch').onClick.listen((_) {
+  querySelector('#show-lunch').onClick.listen((_) async {
     await lunch.loadLibrary();
     onLunchLoaded();
   });
-  querySelector('#show-dinner').onClick.listen((_) {
+  querySelector('#show-dinner').onClick.listen((_) async {
     await dinner.loadLibrary();
     onDinnerLoaded();
   });

From 11631eea76b12072cb40ab4aecdc8d85c0526589 Mon Sep 17 00:00:00 2001
From: Damon Douglas <damon@hospiq.com>
Date: Wed, 26 Aug 2015 19:28:44 -0400
Subject: [PATCH 3/3] Fix #92: Code cleanup.

---
 .../deleting_a_file_directory_or_symlink.dart |  7 +-
 .../directories/creating_a_directory.dart     |  4 +-
 .../listing_the_contents_of_a_directory.dart  |  3 +-
 .../files/creating_a_file.dart                |  5 +-
 .../handling_errors_when_reading_a_file.dart  | 13 ++--
 .../files/reading_a_file_as_a_string.dart     |  2 +-
 .../files/reading_a_file_as_bytes.dart        |  2 +-
 .../files/reading_a_file_as_lines.dart        |  2 +-
 .../files/reading_a_file_using_a_stream.dart  | 12 ++--
 .../files/writing_a_string_to_a_file.dart     |  2 +-
 .../files/writing_bytes_to_a_file.dart        |  2 +-
 .../writing_to_a_file_using_a_stream.dart     |  2 +-
 ...nding_the_type_of_a_filesystem_object.dart | 33 ++++-----
 .../getting_the_parent_directory.dart         |  5 +-
 .../renaming_a_file_directory_or_symlink.dart |  6 +-
 ...ecking_if_a_path_represents_a_symlink.dart |  9 +--
 .../getting_the_target_of_a_link.dart         |  4 +-
 .../example/http/adding_custom_headers.dart   |  9 +--
 .../http/getting_redirection_history.dart     |  2 +-
 ...the_response_content_in_binary_format.dart |  2 +-
 .../http/getting_the_response_headers.dart    |  5 +-
 .../http/handling_an_httprequest_error.dart   | 13 ++--
 .../example/http/making_a_get_request.dart    |  2 +-
 ..._multiple_requests_to_the_same_server.dart | 14 ++--
 ...mplementing_a_Hello_World_http_server.dart |  4 +-
 ...outing_requests_based_on_url_patterns.dart |  9 ++-
 .../example/http_server/serving_a_404.dart    |  2 +-
 ..._the_exit_code_when_running_a_process.dart |  2 +-
 .../running_a_process.dart                    |  2 +-
 .../paths/calculating_relative_paths.dart     |  2 +-
 .../converting_between_a_uri_and_a_path.dart  |  2 +-
 ...getting_information_about_a_file_path.dart |  5 +-
 ...th_separator_for_the_current_platform.dart |  2 +-
 .../example/paths/joining_paths.dart          |  2 +-
 .../paths/parsing_a_path_into_components.dart |  5 +-
 .../getting_environment_variables.dart        |  2 +-
 ...nformation_about_the_script_being_run.dart |  5 +-
 .../identifying_the_operating_system.dart     |  2 +-
 .../sockets/using_serversockets_client.dart   |  2 +-
 .../sockets/using_serversockets_server.dart   |  5 +-
 .../websockets/using_websockets_client.dart   |  2 +-
 .../websockets/using_websockets_server.dart   | 22 +++---
 .../generate_md_for_dartlang.dart             |  4 +-
 .../deferred_loading_example/bin/main.dart    |  2 +-
 .../deferred_loading_example/pubspec.lock     |  3 +
 .../lazyloader/pubspec.lock                   |  7 ++
 .../lazyloader/web/main.dart                  |  4 +-
 html5/.pub/bin/sdk-version                    |  1 +
 html5/pubspec.lock                            | 67 +++++++++++++++++++
 49 files changed, 204 insertions(+), 121 deletions(-)
 create mode 100644 deferred_loading_samples/deferred_loading_example/pubspec.lock
 create mode 100644 deferred_loading_samples/lazyloader/pubspec.lock
 create mode 100644 html5/.pub/bin/sdk-version
 create mode 100644 html5/pubspec.lock

diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
index 5927c0f..1455191 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/deleting_a_file_directory_or_symlink.dart
@@ -5,20 +5,19 @@
 /// Use the FilesSystemEntity `delete()` method to delete a file, directory, or
 /// symlink. This method is inherited by File, Directory, and Link.
 
-
 import 'dart:io';
 
 main() async {
 
   // Create a temporary directory.
   var dir = await Directory.systemTemp.createTemp('my_temp_dir');
-  
+
   // Confirm it exists.
   print(await dir.exists());
-  
+
   // Delete the directory.
   await dir.delete();
-  
+
   // Confirm it no longer exists.
   print(await dir.exists());
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
index 6a801dc..2bded50 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/creating_a_directory.dart
@@ -10,6 +10,6 @@ import 'dart:io';
 
 main() async {
   // Creates dir/ and dir/subdir/.
-  var directory = await new Directory('dir/subdir');
+  var directory = await new Directory('dir/subdir').create(recursive: true);
   print(directory.path);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart
index b8f21da..f6b90a9 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/directories/listing_the_contents_of_a_directory.dart
@@ -16,6 +16,7 @@ main() async {
 
   // List directory contents, recursing into sub-directories, but not following
   // symbolic links.
-  Stream<FileSystemEntity> entityList = systemTempDir.list(recursive: true, followLinks: false);
+  Stream<FileSystemEntity> entityList =
+      systemTempDir.list(recursive: true, followLinks: false);
   await for (FileSystemEntity entity in entityList) print(entity.path);
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
index dcb5654..cc0b293 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/creating_a_file.dart
@@ -14,6 +14,7 @@ main() async {
   var systemTempDir = Directory.systemTemp;
   // Creates dir/, dir/subdir/, and dir/subdir/file.txt in the system
   // temp directory.
-  var file = await new File('${systemTempDir.path}/dir/subdir/file.txt').create(recursive: true);
+  var file = await new File('${systemTempDir.path}/dir/subdir/file.txt').create(
+      recursive: true);
   print(file.path);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart
index 62764ae..0768c84 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/handling_errors_when_reading_a_file.dart
@@ -4,16 +4,13 @@
 
 import 'dart:io';
 
-void handleError(e) {
-  print('There was a ${e.runtimeType} error');
-  print(e.message);
-}
-
 main() async {
   final filename = 'non_existent_file.txt';
   try {
     var file = await new File(filename).readAsString();
-  } catch(e) {
-    handleError(e);    
+    print(file);
+  } catch (e) {
+    print('There was a ${e.runtimeType} error');
+    print('Could not read $filename');
   }
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart
index 6cd93e1..a19f2ea 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_a_string.dart
@@ -9,4 +9,4 @@ import 'dart:io';
 main() async {
   var contents = await new File('file.txt').readAsString();
   print(contents);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart
index 7205841..bf5a260 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_bytes.dart
@@ -13,4 +13,4 @@ main() async {
   // Do something with the bytes. For example, convert to base64.
   String base64 = CryptoUtils.bytesToBase64(bytes);
   print(base64);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
index 18770be..b5c3b23 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_as_lines.dart
@@ -9,4 +9,4 @@ import 'dart:io';
 main() async {
   List<String> lines = await new File('file.txt').readAsLines();
   lines.forEach((String line) => print(line));
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart
index 05a93b4..9dcf220 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/reading_a_file_using_a_stream.dart
@@ -18,16 +18,16 @@ main() async {
   Stream<List<int>> inputStream = file.openRead();
 
   Stream<String> lines = inputStream
-    // Decode to UTF8.
-    .transform(UTF8.decoder)
-    // Convert stream to individual lines.
-    .transform(new LineSplitter());
+      // Decode to UTF8.
+      .transform(UTF8.decoder)
+      // Convert stream to individual lines.
+      .transform(new LineSplitter());
 
   try {
     await for (String line in lines) print('$line: ${line.length} bytes');
-  } catch(e) {
+  } catch (e) {
     print(e.toString());
   }
 
   print('File is now closed.');
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
index e7379b6..6f59653 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_a_string_to_a_file.dart
@@ -11,4 +11,4 @@ main() async {
   final filename = 'file.txt';
   var file = await new File(filename).writeAsString('some content');
   print("Content written to $file");
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart
index ae23b88..299e487 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_bytes_to_a_file.dart
@@ -18,4 +18,4 @@ main() async {
 
   // Decode to a string, and print.
   print(UTF8.decode(data)); // Prints 'Dart!'.
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart
index 460aae3..ccd59ec 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/files/writing_to_a_file_using_a_stream.dart
@@ -16,4 +16,4 @@ main() {
 
   // Close the IOSink to free system resources.
   sink.close();
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
index ee3f14d..c5cb281 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/finding_the_type_of_a_filesystem_object.dart
@@ -10,7 +10,8 @@ import 'dart:async'; // Import not needed but added here to explicitly assign ty
 
 main() async {
   // List the contents of the system temp directory.
-  Stream<FileSystemEntity> entityList = Directory.systemTemp.list(recursive: true, followLinks: false);
+  Stream<FileSystemEntity> entityList =
+      Directory.systemTemp.list(recursive: true, followLinks: false);
 
   await for (FileSystemEntity entity in entityList) {
     // Get the type of the FileSystemEntity, apply the appropiate label, and
@@ -18,19 +19,19 @@ main() async {
     FileSystemEntityType type = await FileSystemEntity.type(entity.path);
 
     String label;
-      switch (type) {
-        case FileSystemEntityType.DIRECTORY:
-          label = 'D';
-          break;
-        case FileSystemEntityType.FILE:
-          label = 'F';
-          break;
-        case FileSystemEntityType.LINK:
-          label = 'L';
-          break;
-        default:
-          label = 'UNKNOWN';
-      }
-      print('$label: ${entity.path}');
+    switch (type) {
+      case FileSystemEntityType.DIRECTORY:
+        label = 'D';
+        break;
+      case FileSystemEntityType.FILE:
+        label = 'F';
+        break;
+      case FileSystemEntityType.LINK:
+        label = 'L';
+        break;
+      default:
+        label = 'UNKNOWN';
+    }
+    print('$label: ${entity.path}');
   }
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart
index 706d79b..8ca71a8 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/getting_the_parent_directory.dart
@@ -11,7 +11,8 @@ import 'dart:async'; // Import not needed but added here to explicitly assign ty
 
 main() async {
   // List the contents of the system temp directory.
-  Stream<FileSystemEntity> entityList = Directory.systemTemp.list(recursive: true, followLinks: false);
+  Stream<FileSystemEntity> entityList =
+      Directory.systemTemp.list(recursive: true, followLinks: false);
 
   await for (FileSystemEntity entity in entityList) print(entity.parent.path);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
index dfe8f34..e5b777b 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/renaming_a_file_directory_or_symlink.dart
@@ -17,10 +17,10 @@ main() async {
 
   // Prints path ending with `foo.txt`.
   print('The path is ${file.path}');
-  
+
   // Rename the file.
   await file.rename('${systemTempDir.path}/bar.txt');
-  
+
   // Prints path ending with `bar.txt`.
   print('The path is ${file.path}');
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
index 3547dbd..85f1d49 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/checking_if_a_path_represents_a_symlink.dart
@@ -9,10 +9,11 @@ main() async {
   var systemTempDir = Directory.systemTemp;
 
   // List the contents of the system temp directory.
-  Stream<FileSystemEntity> entityList = systemTempDir.list(recursive: true, followLinks: false); 
+  Stream<FileSystemEntity> entityList =
+      systemTempDir.list(recursive: true, followLinks: false);
   await for (FileSystemEntity entity in entityList) {
-  	// Print the path only if it represents a symlink.
-   	var isLink = await FileSystemEntity.isLink(entity.path);
-  	if (isLink) print(entity.path);
+    // Print the path only if it represents a symlink.
+    var isLink = await FileSystemEntity.isLink(entity.path);
+    if (isLink) print(entity.path);
   }
 }
diff --git a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart
index b98b54a..c5e7976 100644
--- a/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart
+++ b/dart_io_mini_samples/example/files_directories_and_symlinks/symlinks/getting_the_target_of_a_link.dart
@@ -18,7 +18,7 @@ main() async {
     print(link.path);
     var targetPath = await link.target();
     print(targetPath);
-  } catch(e) {
+  } catch (e) {
     print(e.message);
   }
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http/adding_custom_headers.dart b/dart_io_mini_samples/example/http/adding_custom_headers.dart
index a824c4b..7b8ae34 100644
--- a/dart_io_mini_samples/example/http/adding_custom_headers.dart
+++ b/dart_io_mini_samples/example/http/adding_custom_headers.dart
@@ -10,7 +10,8 @@ import 'package:http/http.dart' as http;
 
 main() async {
   var url = 'https://api.github.com/users/dart-lang/repos';
-  var response = await http.get(url, headers : {'User-Agent':'Dart/1.0 (My Dart client)'});
+  var response =
+      await http.get(url, headers: {'User-Agent': 'Dart/1.0 (My Dart client)'});
 
   List<String> repos = JSON.decode(response.body);
   var heading = 'Repository | Star count  | Fork count';
@@ -18,7 +19,7 @@ main() async {
   print(new List.filled(heading.length, '=').join());
   for (var repo in repos) {
     print("${repo['name']} | "
-          "${repo['stargazers_count']} | "
-          "${repo['forks_count']}");
+        "${repo['stargazers_count']} | "
+        "${repo['forks_count']}");
   }
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http/getting_redirection_history.dart b/dart_io_mini_samples/example/http/getting_redirection_history.dart
index 17d56f5..b251fd7 100644
--- a/dart_io_mini_samples/example/http/getting_redirection_history.dart
+++ b/dart_io_mini_samples/example/http/getting_redirection_history.dart
@@ -15,4 +15,4 @@ main() async {
   redirects.forEach((redirect) {
     print(redirect.location); // Prints 'http://www.google.com'.
   });
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart b/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart
index f5f1692..62ea02d 100644
--- a/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart
+++ b/dart_io_mini_samples/example/http/getting_the_response_content_in_binary_format.dart
@@ -15,4 +15,4 @@ main() async {
   // Do something with the bytes. For example, convert to base64.
   String base64 = CryptoUtils.bytesToBase64(bytes);
   print(base64);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http/getting_the_response_headers.dart b/dart_io_mini_samples/example/http/getting_the_response_headers.dart
index ad1d1ad..d665837 100644
--- a/dart_io_mini_samples/example/http/getting_the_response_headers.dart
+++ b/dart_io_mini_samples/example/http/getting_the_response_headers.dart
@@ -16,9 +16,10 @@ main() async {
   print(response.headers.keys);
 
   // Get header values.
-  print("access-control-allow-origin' = ${response.headers['access-control-allow-origin']}");
+  print(
+      "access-control-allow-origin' = ${response.headers['access-control-allow-origin']}");
   print("content-type = ${response.headers['content-type']}");
   print("date = ${response.headers['date']}");
   print("content-length = ${response.headers['content-length']}");
   print("connection = ${response.headers['connection']}");
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart b/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart
index 24e32aa..935cbb3 100644
--- a/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart
+++ b/dart_io_mini_samples/example/http/handling_an_httprequest_error.dart
@@ -2,7 +2,7 @@
 // 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.
 
-/// An HTTP request may return a response, or it may generate an error. 
+/// An HTTP request may return a response, or it may generate an error.
 import 'package:http/http.dart' as http;
 
 handleSuccess(http.Response response) {
@@ -17,10 +17,9 @@ handleFailure(error) {
 
 main() async {
   try {
-  	var response = await http.get("http://some_bogus_website.org");
-  	handleSuccess(response);
+    var response = await http.get("http://some_bogus_website.org");
+    handleSuccess(response);
+  } catch (e) {
+    handleFailure(e);
   }
-  catch(e) {
-  	handleFailure(e);
-  }
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http/making_a_get_request.dart b/dart_io_mini_samples/example/http/making_a_get_request.dart
index 268c5d0..51309b3 100644
--- a/dart_io_mini_samples/example/http/making_a_get_request.dart
+++ b/dart_io_mini_samples/example/http/making_a_get_request.dart
@@ -11,4 +11,4 @@ main() async {
   var response = await http.get(url);
   print("Response status: ${response.statusCode}");
   print("Response body: ${response.body}");
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart b/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
index f0508f1..c7632d0 100644
--- a/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
+++ b/dart_io_mini_samples/example/http/making_multiple_requests_to_the_same_server.dart
@@ -21,9 +21,13 @@ printResponseBody(response) {
 main() async {
   var url = 'http://www.google.com/';
   var client = new http.Client();
-  var response = await client.get('${url}/search');
-  printResponseBody(response);
-  response = await client.get('${url}/doodles');
-  printResponseBody(response);
-  client.close();
+  try {
+    var response = await client.get('${url}/search');
+    printResponseBody(response);
+    response = await client.get('${url}/doodles');
+    printResponseBody(response);
+    client.close();
+  } catch (e) {
+    client.close();
+  }
 }
diff --git a/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart b/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
index 93e65fc..228bdfc 100644
--- a/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
+++ b/dart_io_mini_samples/example/http_server/implementing_a_Hello_World_http_server.dart
@@ -12,9 +12,9 @@ main() async {
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
   print("Serving at ${server.address}:${server.port}");
   await for (HttpRequest request in server) {
-  	request.response
+    request.response
       ..headers.contentType = new ContentType("text", "plain", charset: "utf-8")
       ..write('Hello, world')
       ..close();
   }
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart b/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
index 223630d..a4cda88 100644
--- a/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
+++ b/dart_io_mini_samples/example/http_server/routing_requests_based_on_url_patterns.dart
@@ -14,7 +14,6 @@ final postsUrl = new UrlPattern(r'/posts\/?');
 // Pattern for a single post('/post/24', for example).
 final postUrl = new UrlPattern(r'/post/(\d+)\/?');
 
-
 // Callback for all posts (plural).
 servePosts(req) {
   req.response.write("All blog posts");
@@ -38,8 +37,8 @@ serveNotFound(req) {
 main() async {
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
   var router = new Router(server)
-  // Associate callbacks with URLs.
-  ..serve(postsUrl, method: 'GET').listen(servePosts)
-  ..serve(postUrl, method: 'GET').listen(servePost)
-  ..defaultStream.listen(serveNotFound);
+    // Associate callbacks with URLs.
+    ..serve(postsUrl, method: 'GET').listen(servePosts)
+    ..serve(postUrl, method: 'GET').listen(servePost)
+    ..defaultStream.listen(serveNotFound);
 }
diff --git a/dart_io_mini_samples/example/http_server/serving_a_404.dart b/dart_io_mini_samples/example/http_server/serving_a_404.dart
index 4e00f0f..536eae4 100644
--- a/dart_io_mini_samples/example/http_server/serving_a_404.dart
+++ b/dart_io_mini_samples/example/http_server/serving_a_404.dart
@@ -24,4 +24,4 @@ main() async {
 
   var server = await HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 8080);
   await for (var request in server) virDir.serveRequest(request);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart b/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart
index 57f8047..6a70b6e 100644
--- a/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart
+++ b/dart_io_mini_samples/example/interacting_with_processes/obtaining_the_exit_code_when_running_a_process.dart
@@ -14,4 +14,4 @@ main() async {
   // Get the exit code from the new process.
   var exitCode = await process.exitCode;
   print('exit code: $exitCode');
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart b/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart
index a26e3be..3876637 100644
--- a/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart
+++ b/dart_io_mini_samples/example/interacting_with_processes/running_a_process.dart
@@ -11,4 +11,4 @@ main() async {
   // List all files in the current directory in UNIX-like operating systems.
   var results = await Process.run('ls', ['-l']);
   print(results.stdout);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/paths/calculating_relative_paths.dart b/dart_io_mini_samples/example/paths/calculating_relative_paths.dart
index b877e47..316dbc6 100644
--- a/dart_io_mini_samples/example/paths/calculating_relative_paths.dart
+++ b/dart_io_mini_samples/example/paths/calculating_relative_paths.dart
@@ -24,4 +24,4 @@ main() {
   var samples = 'http://www.dartlang.org/samples';
   var docs = 'http://www.dartlang.org/docs';
   print(path.relative(samples, from: docs)); // Prints '../samples'.
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart b/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart
index a516d24..18e463c 100644
--- a/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart
+++ b/dart_io_mini_samples/example/paths/converting_between_a_uri_and_a_path.dart
@@ -10,4 +10,4 @@ import 'package:path/path.dart' as path;
 main() {
   var uri = path.toUri('http://dartlang.org/samples');
   print(path.fromUri(uri)); // Prints 'http:/dartlang.org/samples'.
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart b/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
index 90b251b..dc63bb0 100644
--- a/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
+++ b/dart_io_mini_samples/example/paths/getting_information_about_a_file_path.dart
@@ -12,10 +12,11 @@ import 'dart:io';
 
 main() async {
   // Create dir/ and dir/file.txt in the system temp directory.
-  var file = await new File('${Directory.systemTemp.path}/dir/myFile.txt').create(recursive: true);
+  var file = await new File('${Directory.systemTemp.path}/dir/myFile.txt')
+      .create(recursive: true);
 
   print(path.basename(file.path)); // Prints 'file.txt'.
-  print(path.dirname(file.path));  // Prints path ending with 'dir'.
+  print(path.dirname(file.path)); // Prints path ending with 'dir'.
   print(path.basenameWithoutExtension(file.path)); // Prints 'myFile'.
   print(path.extension(file.path)); // Prints '.txt'.
 
diff --git a/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart b/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart
index aeca37b..b6f95e9 100644
--- a/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart
+++ b/dart_io_mini_samples/example/paths/getting_the_path_separator_for_the_current_platform.dart
@@ -15,4 +15,4 @@ main() {
 
   // This does the same.
   print(path.separator);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/paths/joining_paths.dart b/dart_io_mini_samples/example/paths/joining_paths.dart
index e11452d..163d8c9 100644
--- a/dart_io_mini_samples/example/paths/joining_paths.dart
+++ b/dart_io_mini_samples/example/paths/joining_paths.dart
@@ -11,4 +11,4 @@ import 'package:path/path.dart' as path;
 main() {
   var newPath = path.join('/Users/shailen', 'dart/projects');
   print(newPath); // Prints '/Users.shailen/dart/projects'.
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart b/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart
index 3993232..b9e8d16 100644
--- a/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart
+++ b/dart_io_mini_samples/example/paths/parsing_a_path_into_components.dart
@@ -11,5 +11,6 @@ main() {
   print(path.split('/Users/shailen')); // Prints ['/', 'Users', 'shailen'].
 
   // Windows example.
-  print(path.split(r'C:\tempdir\tmp.txt')); // Prints [r'C:\', 'tempdir', 'tmp.txt'])
-}
\ No newline at end of file
+  print(path
+      .split(r'C:\tempdir\tmp.txt')); // Prints [r'C:\', 'tempdir', 'tmp.txt'])
+}
diff --git a/dart_io_mini_samples/example/platform/getting_environment_variables.dart b/dart_io_mini_samples/example/platform/getting_environment_variables.dart
index 37ed47c..1cdc617 100644
--- a/dart_io_mini_samples/example/platform/getting_environment_variables.dart
+++ b/dart_io_mini_samples/example/platform/getting_environment_variables.dart
@@ -9,4 +9,4 @@ import 'dart:io' show Platform;
 main() {
   Map<String, String> envVars = Platform.environment;
   print(envVars['PATH']);
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart b/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart
index f5ab395..cf6db76 100644
--- a/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart
+++ b/dart_io_mini_samples/example/platform/getting_information_about_the_script_being_run.dart
@@ -14,5 +14,6 @@ main() {
 
   // Convert the URI to a path.
   var path = uri.toFilePath();
-  print(path); // Prints something like 'file:///Users/shailentuli/workspace/...'.
-}
\ No newline at end of file
+  print(
+      path); // Prints something like 'file:///Users/shailentuli/workspace/...'.
+}
diff --git a/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart b/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart
index 6213a50..606e923 100644
--- a/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart
+++ b/dart_io_mini_samples/example/platform/identifying_the_operating_system.dart
@@ -25,4 +25,4 @@ main() {
   } else {
     stdout.writeln('something other than MacOS, Android, Linux, or Windows');
   }
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/sockets/using_serversockets_client.dart b/dart_io_mini_samples/example/sockets/using_serversockets_client.dart
index 8b446cf..10209e3 100644
--- a/dart_io_mini_samples/example/sockets/using_serversockets_client.dart
+++ b/dart_io_mini_samples/example/sockets/using_serversockets_client.dart
@@ -12,4 +12,4 @@ main() async {
   var socket = await Socket.connect('127.0.0.1', 4041);
   print(socket.runtimeType);
   socket.write('Hello, World!');
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/sockets/using_serversockets_server.dart b/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
index b8e6a2c..8671447 100644
--- a/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
+++ b/dart_io_mini_samples/example/sockets/using_serversockets_server.dart
@@ -11,5 +11,6 @@ import 'dart:convert';
 main() async {
   var serverSocket = await ServerSocket.bind('127.0.0.1', 4041);
   print('connected');
-  await for (var socket in serverSocket) socket.transform(UTF8.decoder).listen(print);
-}
\ No newline at end of file
+  await for (var socket
+      in serverSocket) socket.transform(UTF8.decoder).listen(print);
+}
diff --git a/dart_io_mini_samples/example/websockets/using_websockets_client.dart b/dart_io_mini_samples/example/websockets/using_websockets_client.dart
index 6dca789..c7bfe03 100644
--- a/dart_io_mini_samples/example/websockets/using_websockets_client.dart
+++ b/dart_io_mini_samples/example/websockets/using_websockets_client.dart
@@ -10,4 +10,4 @@ import 'dart:io';
 main() async {
   var socket = await WebSocket.connect('ws://127.0.0.1:4040/ws');
   socket.add('Hello, World!');
-}
\ No newline at end of file
+}
diff --git a/dart_io_mini_samples/example/websockets/using_websockets_server.dart b/dart_io_mini_samples/example/websockets/using_websockets_server.dart
index e56a139..46bed40 100644
--- a/dart_io_mini_samples/example/websockets/using_websockets_server.dart
+++ b/dart_io_mini_samples/example/websockets/using_websockets_server.dart
@@ -6,22 +6,18 @@
 /// `WebSocketTransformer.upgrade()`.
 
 import 'dart:io';
-import 'dart:async';
 
 handleMsg(msg) {
   print('Message received: $msg');
 }
 
-main() {
-  runZoned(() async {
-    var server = await HttpServer.bind('127.0.0.1', 4040);
-    await for (HttpRequest req in server) {
-      if (req.uri.path == '/ws') {
-        // Upgrade a HttpRequest to a WebSocket connection. 
-        var socket = await WebSocketTransformer.upgrade(req);
-        socket.listen(handleMsg);
-      }
+main() async {
+  var server = await HttpServer.bind('127.0.0.1', 4040);
+  await for (HttpRequest req in server) {
+    if (req.uri.path == '/ws') {
+      // Upgrade an HttpRequest to a WebSocket connection.
+      var socket = await WebSocketTransformer.upgrade(req);
+      socket.listen(handleMsg);
     }
-  },
-  onError: (e) => print("An error occurred."));
-}
\ No newline at end of file
+  }
+}
diff --git a/dart_io_mini_samples/generate_md_for_dartlang.dart b/dart_io_mini_samples/generate_md_for_dartlang.dart
index 208f301..35e49b3 100644
--- a/dart_io_mini_samples/generate_md_for_dartlang.dart
+++ b/dart_io_mini_samples/generate_md_for_dartlang.dart
@@ -39,7 +39,7 @@ main() {
   // RegExp to match a markdown link such as [Google](http://google.com)
   var regExp = new RegExp(r'\[([^\]]+)\]\(([^)]+)\)');
   var readme = new File('README.md').readAsLinesSync();
-  for(var line in readme) {
+  for (var line in readme) {
     line = line.trim();
     if (line.startsWith("*")) {
       if (regExp.hasMatch(line)) {
@@ -63,7 +63,7 @@ main() {
       if (line.startsWith('## ')) {
         print('{:.no_toc}');
         print('');
-        print ('{% include default_toc.html %}');
+        print('{% include default_toc.html %}');
       }
     }
   }
diff --git a/deferred_loading_samples/deferred_loading_example/bin/main.dart b/deferred_loading_samples/deferred_loading_example/bin/main.dart
index a357516..e3eaa56 100644
--- a/deferred_loading_samples/deferred_loading_example/bin/main.dart
+++ b/deferred_loading_samples/deferred_loading_example/bin/main.dart
@@ -3,4 +3,4 @@ import 'package:deferred_loading_example/hello.dart' deferred as hello;
 main() async {
   await hello.loadLibrary();
   hello.printGreeting();
-}
\ No newline at end of file
+}
diff --git a/deferred_loading_samples/deferred_loading_example/pubspec.lock b/deferred_loading_samples/deferred_loading_example/pubspec.lock
new file mode 100644
index 0000000..e7b03b5
--- /dev/null
+++ b/deferred_loading_samples/deferred_loading_example/pubspec.lock
@@ -0,0 +1,3 @@
+# Generated by pub
+# See http://pub.dartlang.org/doc/glossary.html#lockfile
+packages: {}
diff --git a/deferred_loading_samples/lazyloader/pubspec.lock b/deferred_loading_samples/lazyloader/pubspec.lock
new file mode 100644
index 0000000..e6e9894
--- /dev/null
+++ b/deferred_loading_samples/lazyloader/pubspec.lock
@@ -0,0 +1,7 @@
+# Generated by pub
+# See http://pub.dartlang.org/doc/glossary.html#lockfile
+packages:
+  browser:
+    description: browser
+    source: hosted
+    version: "0.10.0+2"
diff --git a/deferred_loading_samples/lazyloader/web/main.dart b/deferred_loading_samples/lazyloader/web/main.dart
index 48762cd..0528b2f 100644
--- a/deferred_loading_samples/lazyloader/web/main.dart
+++ b/deferred_loading_samples/lazyloader/web/main.dart
@@ -1,8 +1,8 @@
 import 'dart:html';
 
 import "package:lazyloader/breakfast.dart" deferred as breakfast;
-import "package:lazyloader/lunch.dart"     deferred as lunch;
-import "package:lazyloader/dinner.dart"    deferred as dinner;
+import "package:lazyloader/lunch.dart" deferred as lunch;
+import "package:lazyloader/dinner.dart" deferred as dinner;
 
 main() {
   querySelector('#show-breakfast').onClick.listen((_) async {
diff --git a/html5/.pub/bin/sdk-version b/html5/.pub/bin/sdk-version
new file mode 100644
index 0000000..0a5af26
--- /dev/null
+++ b/html5/.pub/bin/sdk-version
@@ -0,0 +1 @@
+1.11.3
diff --git a/html5/pubspec.lock b/html5/pubspec.lock
new file mode 100644
index 0000000..d0ebb08
--- /dev/null
+++ b/html5/pubspec.lock
@@ -0,0 +1,67 @@
+# Generated by pub
+# See http://pub.dartlang.org/doc/glossary.html#lockfile
+packages:
+  args:
+    description: args
+    source: hosted
+    version: "0.13.2"
+  bot:
+    description: bot
+    source: hosted
+    version: "0.28.0"
+  bot_io:
+    description: bot_io
+    source: hosted
+    version: "0.26.3+2"
+  browser:
+    description: browser
+    source: hosted
+    version: "0.10.0+2"
+  collection:
+    description: collection
+    source: hosted
+    version: "1.1.1"
+  completion:
+    description: completion
+    source: hosted
+    version: "0.1.4"
+  crypto:
+    description: crypto
+    source: hosted
+    version: "0.9.0"
+  csslib:
+    description: csslib
+    source: hosted
+    version: "0.12.1"
+  hop:
+    description: hop
+    source: hosted
+    version: "0.32.0"
+  html:
+    description: html
+    source: hosted
+    version: "0.12.1+2"
+  html5lib:
+    description: html5lib
+    source: hosted
+    version: "0.12.1"
+  logging:
+    description: logging
+    source: hosted
+    version: "0.9.3"
+  path:
+    description: path
+    source: hosted
+    version: "1.3.6"
+  source_span:
+    description: source_span
+    source: hosted
+    version: "1.1.2"
+  utf:
+    description: utf
+    source: hosted
+    version: "0.9.0+2"
+  vector_math:
+    description: vector_math
+    source: hosted
+    version: "1.4.3"