Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Unified Diff: lib/src/barback/pub_package_provider.dart

Issue 2184303002: Make pub strong-mode clean. (Closed) Base URL: git@github.com:dart-lang/pub.git@master
Patch Set: Code review changes Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/src/barback/load_all_transformers.dart ('k') | lib/src/barback/transformer_config.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/barback/pub_package_provider.dart
diff --git a/lib/src/barback/pub_package_provider.dart b/lib/src/barback/pub_package_provider.dart
index 13dc9c91f13140daad69c63f5ac874575a9479f2..71aafcf2c06e34e619009c5af22d9b182f575062 100644
--- a/lib/src/barback/pub_package_provider.dart
+++ b/lib/src/barback/pub_package_provider.dart
@@ -5,14 +5,17 @@
import 'dart:async';
import 'dart:io';
+import 'package:async/async.dart';
import 'package:barback/barback.dart';
+import 'package:collection/collection.dart';
import 'package:path/path.dart' as path;
+import 'package:pub_semver/pub_semver.dart';
import '../io.dart';
+import '../package.dart';
import '../package_graph.dart';
import '../preprocess.dart';
import '../sdk.dart' as sdk;
-import '../utils.dart';
/// The path to the lib directory of the compiler_unsupported package used by
/// pub.
@@ -63,7 +66,8 @@ class PubPackageProvider implements StaticPackageProvider {
return new Asset.fromPath(id, file);
}
- var versions = mapMap(_graph.packages,
+ var versions = mapMap/*<String, Package, String, Version>*/(
+ _graph.packages,
value: (_, package) => package.version);
var contents = readTextFile(file);
contents = preprocess(contents, versions, path.toUri(file));
@@ -95,7 +99,7 @@ class PubPackageProvider implements StaticPackageProvider {
var file = path.join(_compilerUnsupportedLib, 'sdk',
path.joinAll(parts.skip(1))) + "_";
_assertExists(file, id);
- return new Asset.fromStream(id, callbackStream(() =>
+ return new Asset.fromStream(id, new LazyStream(() =>
_zlib.decoder.bind(new File(file).openRead())));
}
« no previous file with comments | « lib/src/barback/load_all_transformers.dart ('k') | lib/src/barback/transformer_config.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698