Fix pre-existing HintCode.UNNECESSARY_TYPE_CHECK_TRUE (dart-archive/c…

…ollection#206) This prepares for landing https://dart-review.googlesource.com/c/sdk/+/190360 into the analyzer.
dart-lang · Sep 7, 2021 · ae89a6a · ae89a6a
1 parent 15a7681
commit ae89a6a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/pkgs/collection/CHANGELOG.md b/pkgs/collection/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 1.16.1-dev
+
 ## 1.16.0
 
 * Use a stable sort algorithm in the `IterableExtension.sortedBy` method.

diff --git a/pkgs/collection/lib/src/equality.dart b/pkgs/collection/lib/src/equality.dart
@@ -67,7 +67,7 @@ class EqualityBy<E, F> implements Equality<E> {
   bool isValidKey(Object? o) {
     if (o is E) {
       final value = _comparisonKey(o);
-      return value is F && _inner.isValidKey(value);
+      return _inner.isValidKey(value);
     }
     return false;
   }

diff --git a/pkgs/collection/pubspec.yaml b/pkgs/collection/pubspec.yaml
@@ -1,5 +1,5 @@
 name: collection
-version: 1.16.0
+version: 1.16.1-dev
 
 description: Collections and utilities functions and classes related to collections.
 repository: https://github.com/dart-lang/collection

diff --git a/pkgs/collection/test/wrapper_test.dart b/pkgs/collection/test/wrapper_test.dart
@@ -327,7 +327,7 @@ void main() {
 
       test('.every', () {
         expect(set.every((element) => element == 'foo'), isFalse);
-        expect(set.every((element) => element is String), isTrue);
+        expect(set.every((element) => true), isTrue);
       });
 
       test('.expand', () {
@@ -341,7 +341,7 @@ void main() {
       });
 
       test('.firstWhere', () {
-        expect(set.firstWhere((element) => element is String), equals('foo'));
+        expect(set.firstWhere((element) => true), equals('foo'));
         expect(set.firstWhere((element) => element.startsWith('b')),
             equals('bar'));
         expect(() => set.firstWhere((element) => element is int),
@@ -380,7 +380,7 @@ void main() {
       });
 
       test('.lastWhere', () {
-        expect(set.lastWhere((element) => element is String), equals('bar'));
+        expect(set.lastWhere((element) => true), equals('bar'));
         expect(
             set.lastWhere((element) => element.startsWith('f')), equals('foo'));
         expect(
@@ -403,8 +403,7 @@ void main() {
         expect(() => set.singleWhere((element) => element == 'baz'),
             throwsStateError);
         expect(set.singleWhere((element) => element == 'foo'), 'foo');
-        expect(() => set.singleWhere((element) => element is String),
-            throwsStateError);
+        expect(() => set.singleWhere((element) => true), throwsStateError);
       });
 
       test('.skip', () {
@@ -418,7 +417,7 @@ void main() {
             equals(['bar']));
         expect(set.skipWhile((element) => element.startsWith('z')),
             equals(['foo', 'bar']));
-        expect(set.skipWhile((element) => element is String), equals([]));
+        expect(set.skipWhile((element) => true), equals([]));
       });
 
       test('.take', () {
@@ -431,8 +430,7 @@ void main() {
         expect(set.takeWhile((element) => element.startsWith('f')),
             equals(['foo']));
         expect(set.takeWhile((element) => element.startsWith('z')), equals([]));
-        expect(set.takeWhile((element) => element is String),
-            equals(['foo', 'bar']));
+        expect(set.takeWhile((element) => true), equals(['foo', 'bar']));
       });
 
       test('.toList', () {