Skip to content

Commit b41111e

Browse files
committed
cleanup: migrate from .expand to .followedBy
1 parent 537933f commit b41111e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

json_serializable/lib/src/json_serializable_generator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class JsonSerializableGenerator
9191
new JsonSerializableGenerator(
9292
useWrappers: useWrappers,
9393
anyMap: anyMap,
94-
typeHelpers: new List.unmodifiable(
95-
[typeHelpers, _defaultHelpers].expand((e) => e)));
94+
typeHelpers:
95+
new List.unmodifiable(typeHelpers.followedBy(_defaultHelpers)));
9696

9797
@override
9898
Future<String> generateForAnnotatedElement(

json_serializable/lib/src/shared_checkers.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ DartType _getImplementationType(DartType type, TypeChecker checker) {
6363
if (checker.isExactlyType(type)) return type;
6464

6565
if (type is InterfaceType) {
66-
var match = [type.interfaces, type.mixins]
67-
.expand((e) => e)
66+
var match = type.interfaces
67+
.followedBy(type.mixins)
6868
.map((type) => _getImplementationType(type, checker))
6969
.firstWhere((value) => value != null, orElse: () => null);
7070

json_serializable/lib/src/type_helpers/json_helper.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ MethodElement _getMethod(DartType type, String methodName) {
102102
return method;
103103
}
104104

105-
var match = [type.interfaces, type.mixins]
106-
.expand((e) => e)
105+
var match = type.interfaces
106+
.followedBy(type.mixins)
107107
.map((type) => _getMethod(type, methodName))
108108
.firstWhere((value) => value != null, orElse: () => null);
109109

0 commit comments

Comments
 (0)