commit 7759f2cf9baf1bb67a08d0be681349df756ee6e5
author Bob Nystrom <rnystrom@google.com> Tue Nov 29 13:49:26 2016 -0800
committer Bob Nystrom <rnystrom@google.com> Tue Nov 29 13:49:26 2016 -0800
tree 63988a02bc7180e757fb4490c506cedfc759007a
parent d2428b2dcf40a052d0a2abc19ed0ce1a53f09551
parent 89c982a6bd0fca57d2a77463904c076f67f264c6

Merge branch 'master' into bump

test/formatter_test.dart

diff --git a/test/formatter_test.dart b/test/formatter_test.dart
index 4e3df04..0960607 100644
--- a/test/formatter_test.dart
+++ b/test/formatter_test.dart
@@ -137,7 +137,7 @@
   var testDir = p.dirname(currentMirrorSystem()
       .findLibrary(#dart_style.test.formatter_test)
       .uri
-      .path);
+      .toFilePath());
 
   var entries = new Directory(p.join(testDir, name))
       .listSync(recursive: true, followLinks: false);

test/utils.dart

diff --git a/test/utils.dart b/test/utils.dart
index ba8796d..022fa28 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -22,7 +22,7 @@
   // Locate the "test" directory. Use mirrors so that this works with the test
   // package, which loads this suite into an isolate.
   var testDir = p.dirname(
-      currentMirrorSystem().findLibrary(#dart_style.test.utils).uri.path);
+      currentMirrorSystem().findLibrary(#dart_style.test.utils).uri.toFilePath());
 
   var formatterPath = p.normalize(p.join(testDir, "../bin/format.dart"));