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

Unified Diff: lib/src/utils.dart

Issue 1730173004: Add on_os and on_platform fields. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: Code review changes Created 4 years, 10 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/runner/plugin/platform_helpers.dart ('k') | test/runner/configuration/configuration_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/utils.dart
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 6d54faf0b1d8c284e8ddc1d0643123b58a40e954..73e42cb38fd75dba89f25e0592c1b35962b00215 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -228,11 +228,11 @@ Map mapMap(Map map, {key(key, value), value(key, value)}) {
/// not passed, [map2]'s value wins.
Map mergeMaps(Map map1, Map map2, {value(value1, value2)}) {
var result = new Map.from(map1);
- map2.forEach((key, value) {
+ map2.forEach((key, mapValue) {
if (value == null || !result.containsKey(key)) {
- result[key] = value;
+ result[key] = mapValue;
} else {
- result[key] = value(result[key], value);
+ result[key] = value(result[key], mapValue);
}
});
return result;
« no previous file with comments | « lib/src/runner/plugin/platform_helpers.dart ('k') | test/runner/configuration/configuration_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698