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

Unified Diff: lib/src/solver/backtracking_solver.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/pubspec.dart ('k') | lib/src/solver/solve_report.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/solver/backtracking_solver.dart
diff --git a/lib/src/solver/backtracking_solver.dart b/lib/src/solver/backtracking_solver.dart
index 66d4d2edfa130cdaea538ba0582bc39d5fecc468..4735aada47c37880035c9dbabe6921b61b2132e9 100644
--- a/lib/src/solver/backtracking_solver.dart
+++ b/lib/src/solver/backtracking_solver.dart
@@ -139,7 +139,7 @@ class BacktrackingSolver {
/// Creates [_implicitPubspec].
static Pubspec _makeImplicitPubspec(SystemCache systemCache) {
- var dependencies = [];
+ var dependencies = <PackageDep>[];
barback.pubConstraints.forEach((name, constraint) {
dependencies.add(
systemCache.sources.hosted.refFor(name)
@@ -174,7 +174,7 @@ class BacktrackingSolver {
logSolve();
var packages = await _solve();
- var pubspecs = {};
+ var pubspecs = <String, Pubspec>{};
for (var id in packages) {
pubspecs[id.name] = await _getPubspec(id);
}
@@ -204,17 +204,14 @@ class BacktrackingSolver {
/// because we weren't trying to upgrade it, we will just know the current
/// version.
Map<String, List<Version>> _getAvailableVersions(List<PackageId> packages) {
- var availableVersions = new Map<String, List<Version>>();
+ var availableVersions = <String, List<Version>>{};
for (var package in packages) {
var cached = cache.getCachedVersions(package.toRef());
- var versions;
- if (cached != null) {
- versions = cached.map((id) => id.version).toList();
- } else {
- // If the version list was never requested, just use the one known
- // version.
- versions = [package.version];
- }
+ // If the version list was never requested, just use the one known
+ // version.
+ var versions = cached == null
+ ? [package.version]
+ : cached.map((id) => id.version).toList();
availableVersions[package.name] = versions;
}
« no previous file with comments | « lib/src/pubspec.dart ('k') | lib/src/solver/solve_report.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698