Skip to content

Commit fb953b7

Browse files
authored
Cast to List<dynamic> and cast(). (flutter#51591)
1 parent ad44b05 commit fb953b7

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

packages/flutter_driver/lib/src/common/wait.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ class CombinedCondition extends SerializableWaitCondition {
251251
}
252252

253253
final List<SerializableWaitCondition> conditions = <SerializableWaitCondition>[];
254-
for (final Map<String, dynamic> condition in json.decode(jsonMap['conditions'])) {
254+
for (final Map<String, dynamic> condition in (json.decode(jsonMap['conditions']) as List<dynamic>).cast<Map<String, dynamic>>()) {
255255
conditions.add(_deserialize(condition.cast<String, String>()));
256256
}
257257
return CombinedCondition(conditions);

packages/flutter_tools/lib/src/asset.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
335335
final List<_Asset> result = <_Asset>[];
336336

337337
for (final Map<String, dynamic> family in _getMaterialFonts(fontSet)) {
338-
for (final Map<dynamic, dynamic> font in family['fonts']) {
338+
for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) {
339339
final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
340340
result.add(_Asset(
341341
baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),

packages/flutter_tools/lib/src/run_hot.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ class HotRunner extends ResidentRunner {
597597
if (!(reloadReport['success'] as bool)) {
598598
if (printErrors) {
599599
globals.printError('Hot reload was rejected:');
600-
for (final Map<String, dynamic> notice in reloadReport['details']['notices']) {
600+
for (final Map<String, dynamic> notice in (reloadReport['details']['notices'] as List<dynamic>).cast<Map<String, dynamic>>()) {
601601
globals.printError('${notice['message']}');
602602
}
603603
}

packages/flutter_tools/lib/src/test/coverage_collector.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Future<Map<String, dynamic>> _getAllCoverage(VMService service, bool Function(St
206206
if (scriptList['scripts'] == null) {
207207
continue;
208208
}
209-
for (final Map<String, dynamic> script in scriptList['scripts']) {
209+
for (final Map<String, dynamic> script in (scriptList['scripts'] as List<dynamic>).cast<Map<String, dynamic>>()) {
210210
if (!libraryPredicate(script['uri'] as String)) {
211211
continue;
212212
}
@@ -247,7 +247,7 @@ void _buildCoverageMap(
247247
final Map<String, Map<int, int>> hitMaps = <String, Map<int, int>>{};
248248
for (final String scriptId in scripts.keys) {
249249
final Map<String, dynamic> sourceReport = sourceReports[scriptId];
250-
for (final Map<String, dynamic> range in sourceReport['ranges']) {
250+
for (final Map<String, dynamic> range in (sourceReport['ranges'] as List<dynamic>).cast<Map<String, dynamic>>()) {
251251
final Map<String, dynamic> coverage = castStringKeyedMap(range['coverage']);
252252
// Coverage reports may sometimes be null for a Script.
253253
if (coverage == null) {

packages/fuchsia_remote_debug_protocol/lib/src/dart/dart_vm.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class DartVm {
170170
final Map<String, dynamic> jsonVmRef =
171171
await invokeRpc('getVM', timeout: timeout);
172172
final List<IsolateRef> result = <IsolateRef>[];
173-
for (final Map<String, dynamic> jsonIsolate in jsonVmRef['isolates']) {
173+
for (final Map<String, dynamic> jsonIsolate in (jsonVmRef['isolates'] as List<dynamic>).cast<Map<String, dynamic>>()) {
174174
final String name = jsonIsolate['name'] as String;
175175
if (pattern.matchAsPrefix(name) != null) {
176176
_log.fine('Found Isolate matching "$pattern": "$name"');
@@ -213,7 +213,7 @@ class DartVm {
213213
final List<FlutterView> views = <FlutterView>[];
214214
final Map<String, dynamic> rpcResponse =
215215
await invokeRpc('_flutter.listViews', timeout: timeout);
216-
for (final Map<String, dynamic> jsonView in rpcResponse['views']) {
216+
for (final Map<String, dynamic> jsonView in (rpcResponse['views'] as List<dynamic>).cast<Map<String, dynamic>>()) {
217217
final FlutterView flutterView = FlutterView._fromJson(jsonView);
218218
if (flutterView != null) {
219219
views.add(flutterView);

0 commit comments

Comments
 (0)