From d802df49d8a3bb545bddb768e3390bc466c55dc5 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Thu, 13 Jun 2024 20:05:24 -0500 Subject: [PATCH] Switch to `Iterable.cast` instance method (#150185) Switch away from the `Iterable.castFrom` static method to the `Iterable.cast` instance method which is more readable and more consistent with other iterable usages. --- .../flutter/lib/src/widgets/nested_scroll_view.dart | 3 +-- packages/flutter_driver/lib/src/driver/timeline.dart | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/flutter/lib/src/widgets/nested_scroll_view.dart b/packages/flutter/lib/src/widgets/nested_scroll_view.dart index b1adb29483..bd4ef1acc5 100644 --- a/packages/flutter/lib/src/widgets/nested_scroll_view.dart +++ b/packages/flutter/lib/src/widgets/nested_scroll_view.dart @@ -1209,8 +1209,7 @@ class _NestedScrollController extends ScrollController { } Iterable<_NestedScrollPosition> get nestedPositions { - // TODO(vegorov): use instance method version of castFrom when it is available. - return Iterable.castFrom(positions); + return positions.cast<_NestedScrollPosition>(); } } diff --git a/packages/flutter_driver/lib/src/driver/timeline.dart b/packages/flutter_driver/lib/src/driver/timeline.dart index 16d2a62cf7..482cad804b 100644 --- a/packages/flutter_driver/lib/src/driver/timeline.dart +++ b/packages/flutter_driver/lib/src/driver/timeline.dart @@ -111,11 +111,11 @@ List? _parseEvents(Map json) { return null; } - final List timelineEvents = - Iterable.castFrom>(jsonEvents) - .map( - (Map eventJson) => TimelineEvent(eventJson)) - .toList(); + final List timelineEvents = jsonEvents + .cast>() + .map( + (Map eventJson) => TimelineEvent(eventJson)) + .toList(); timelineEvents.sort((TimelineEvent e1, TimelineEvent e2) { return switch ((e1.timestampMicros, e2.timestampMicros)) {