commit 4c697085bef9b91c371af3b766d18b0760787e10
author Sigmund Cherem <sigmund@google.com> Fri Jun 22 18:26:25 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Fri Jun 22 18:26:25 2018 +0000
tree 7186769d8a7fae0b18b7f92d30216c9e5fa3e381
parent 9b814bdf3464f63eff0c423368d4ccf3194271b1

dart2js: Make bazel-input-provider dart2 compliant.

Change-Id: Ia832982852720c3c591621091ba15b81b922d553
Reviewed-on: https://dart-review.googlesource.com/61914
Reviewed-by: Stephen Adams <sra@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>

pkg/compiler/lib/src/source_file_provider.dart

diff --git a/pkg/compiler/lib/src/source_file_provider.dart b/pkg/compiler/lib/src/source_file_provider.dart
index 7b4f019..c2d2fd0 100644
--- a/pkg/compiler/lib/src/source_file_provider.dart
+++ b/pkg/compiler/lib/src/source_file_provider.dart
@@ -465,10 +465,10 @@
   BazelInputProvider(List<String> searchPaths)
       : dirs = searchPaths.map(_resolve).toList();
 
-  static _resolve(String path) => currentDirectory.resolve(path);
+  static Uri _resolve(String path) => currentDirectory.resolve(path);
 
   @override
-  Future<api.Input> readFromUri(Uri uri,
+  Future<api.Input<List<int>>> readFromUri(Uri uri,
       {InputKind inputKind: InputKind.UTF8}) async {
     var resolvedUri = uri;
     var path = uri.path;
@@ -482,7 +482,8 @@
         }
       }
     }
-    api.Input result = await readBytesFromUri(resolvedUri, inputKind);
+    api.Input<List<int>> result =
+        await readBytesFromUri(resolvedUri, inputKind);
     switch (inputKind) {
       case InputKind.UTF8:
         utf8SourceFiles[uri] = utf8SourceFiles[resolvedUri];