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

Side by Side Diff: lib/src/runner/configuration.dart

Issue 1991303002: Hide some names from package:collection. (Closed) Base URL: git@github.com:dart-lang/test@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « lib/src/backend/metadata.dart ('k') | pubspec.yaml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 import 'dart:io'; 5 import 'dart:io';
6 6
7 import 'package:boolean_selector/boolean_selector.dart'; 7 import 'package:boolean_selector/boolean_selector.dart';
8 import 'package:collection/collection.dart'; 8 import 'package:collection/collection.dart' hide mapMap, mergeMaps;
9 import 'package:glob/glob.dart'; 9 import 'package:glob/glob.dart';
10 import 'package:path/path.dart' as p; 10 import 'package:path/path.dart' as p;
11 11
12 import '../backend/metadata.dart'; 12 import '../backend/metadata.dart';
13 import '../backend/platform_selector.dart'; 13 import '../backend/platform_selector.dart';
14 import '../backend/test_platform.dart'; 14 import '../backend/test_platform.dart';
15 import '../frontend/timeout.dart'; 15 import '../frontend/timeout.dart';
16 import '../util/io.dart'; 16 import '../util/io.dart';
17 import '../utils.dart'; 17 import '../utils.dart';
18 import 'configuration/args.dart' as args; 18 import 'configuration/args.dart' as args;
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 548
549 /// Merges two maps whose values are [Configuration]s. 549 /// Merges two maps whose values are [Configuration]s.
550 /// 550 ///
551 /// Any overlapping keys in the maps have their configurations merged in the 551 /// Any overlapping keys in the maps have their configurations merged in the
552 /// returned map. 552 /// returned map.
553 Map<Object, Configuration> _mergeConfigMaps(Map<Object, Configuration> map1, 553 Map<Object, Configuration> _mergeConfigMaps(Map<Object, Configuration> map1,
554 Map<Object, Configuration> map2) => 554 Map<Object, Configuration> map2) =>
555 mergeMaps(map1, map2, 555 mergeMaps(map1, map2,
556 value: (config1, config2) => config1.merge(config2)); 556 value: (config1, config2) => config1.merge(config2));
557 } 557 }
OLDNEW
« no previous file with comments | « lib/src/backend/metadata.dart ('k') | pubspec.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698