Update to latest version of lints (#2140)

kevmoo · web-flow · commit a0a4d1ee1a7b · 2023-11-22T10:49:33.000-08:00
Remove a &lt;R&gt; type parameter from checks that seems unused
diff --git a/integration_tests/spawn_hybrid/pubspec.yaml b/integration_tests/spawn_hybrid/pubspec.yaml
@@ -7,7 +7,7 @@ dependencies:
   path: ^1.8.2
   stream_channel: ^2.1.0
 dev_dependencies:
-  lints: '>=1.0.0 <3.0.0'
+  dart_flutter_team_lints: ^2.0.0
   other_package:
     path: other_package/
   test: any
diff --git a/integration_tests/spawn_hybrid/test/hybrid_test.dart b/integration_tests/spawn_hybrid/test/hybrid_test.dart
@@ -62,7 +62,7 @@ void main() {
     test('emits an error from the stream channel if the isolate fails to load',
         () {
       expect(spawnHybridUri('non existent file').stream.first,
-          throwsA(TypeMatcher<Exception>()));
+          throwsA(isA<Exception>()));
     });
   });
 
@@ -215,7 +215,7 @@ void main() {
         }
       ''');
 
-      expect(channel.stream.first, throwsA(TypeMatcher<TestFailure>()));
+      expect(channel.stream.first, throwsA(isA<TestFailure>()));
     });
 
     test('gracefully handles an unserializable message in the VM', () {
@@ -225,7 +225,7 @@ void main() {
         void hybridMain(StreamChannel channel) {}
       ''');
 
-      expect(() => channel.sink.add([].iterator), throwsArgumentError);
+      expect(() => channel.sink.add(<Object>[].iterator), throwsArgumentError);
     });
 
     test('gracefully handles an unserializable message in the browser',
@@ -236,7 +236,7 @@ void main() {
         void hybridMain(StreamChannel channel) {}
       ''');
 
-      expect(() => channel.sink.add([].iterator), throwsArgumentError);
+      expect(() => channel.sink.add(<Object>[].iterator), throwsArgumentError);
     }, testOn: 'browser');
 
     test('gracefully handles an unserializable message in the hybrid isolate',
diff --git a/integration_tests/spawn_hybrid/test/hybrid_test_io.dart b/integration_tests/spawn_hybrid/test/hybrid_test_io.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library;
+
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
@@ -29,7 +31,7 @@ void main() {
     // isolate closes).
     var port = await channel.stream.first as int;
     var socket = await Socket.connect('localhost', port);
-    expect(socket.listen(null).asFuture(), completes);
+    expect(socket.listen(null).asFuture<void>(), completes);
 
     await channel.sink.close();
   });
diff --git a/integration_tests/spawn_hybrid/test/subdir/hybrid_test.dart b/integration_tests/spawn_hybrid/test/subdir/hybrid_test.dart
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 @TestOn('vm')
+library;
+
 import 'package:test/test.dart';
 
 void main() {
diff --git a/pkgs/checks/lib/src/checks.dart b/pkgs/checks/lib/src/checks.dart
@@ -433,7 +433,7 @@ abstract final class Context<T> {
   ///   }
   /// }
   /// ```
-  Future<void> expectAsync<R>(Iterable<String> Function() clause,
+  Future<void> expectAsync(Iterable<String> Function() clause,
       FutureOr<Rejection?> Function(T) predicate);
 
   /// Expect that [predicate] will not invoke the passed callback with a
@@ -710,7 +710,7 @@ final class _TestContext<T> implements Context<T>, _ClauseDescription {
   }
 
   @override
-  Future<void> expectAsync<R>(Iterable<String> Function() clause,
+  Future<void> expectAsync(Iterable<String> Function() clause,
       FutureOr<Rejection?> Function(T) predicate) async {
     if (!_allowAsync) {
       throw StateError(
@@ -841,7 +841,7 @@ final class _SkippedContext<T> implements Context<T> {
   }
 
   @override
-  Future<void> expectAsync<R>(Iterable<String> Function() clause,
+  Future<void> expectAsync(Iterable<String> Function() clause,
       FutureOr<Rejection?> Function(T) predicate) async {
     // no-op
   }
diff --git a/pkgs/checks/lib/src/collection_equality.dart b/pkgs/checks/lib/src/collection_equality.dart
@@ -4,7 +4,7 @@
 
 import 'dart:collection';
 
-import 'package:checks/context.dart';
+import '../context.dart';
 
 /// Returns a descriptive `which` for a rejection if the elements of [actual]
 /// are unequal to the elements of [expected].
diff --git a/pkgs/checks/lib/src/extensions/async.dart b/pkgs/checks/lib/src/extensions/async.dart
@@ -6,7 +6,8 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:async/async.dart';
-import 'package:checks/context.dart';
+
+import '../../context.dart';
 
 extension FutureChecks<T> on Subject<Future<T>> {
   /// Expects that the `Future` completes to a value without throwing.
@@ -46,7 +47,7 @@ extension FutureChecks<T> on Subject<Future<T>> {
       unawaited(actual.then((r) {
         reject(Rejection(
             actual: prefixFirst('a future that completed to ', literal(r))));
-      }, onError: (e, st) {
+      }, onError: (Object e, StackTrace st) {
         reject(Rejection(actual: [
           'a future that completed as an error:'
         ], which: [
diff --git a/pkgs/checks/lib/src/extensions/core.dart b/pkgs/checks/lib/src/extensions/core.dart
@@ -4,9 +4,10 @@
 
 import 'dart:convert';
 
-import 'package:checks/context.dart';
 import 'package:meta/meta.dart' as meta;
 
+import '../../context.dart';
+
 extension CoreChecks<T> on Subject<T> {
   /// Extracts a property of the value for further expectations.
   ///
diff --git a/pkgs/checks/lib/src/extensions/function.dart b/pkgs/checks/lib/src/extensions/function.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:checks/context.dart';
+import '../../context.dart';
 
 extension FunctionChecks<T> on Subject<T Function()> {
   /// Expects that a function throws synchronously when it is called.
diff --git a/pkgs/checks/lib/src/extensions/iterable.dart b/pkgs/checks/lib/src/extensions/iterable.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:checks/context.dart';
+import '../../context.dart';
 
 import '../collection_equality.dart';
 import 'core.dart';
diff --git a/pkgs/checks/lib/src/extensions/map.dart b/pkgs/checks/lib/src/extensions/map.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:checks/context.dart';
+import '../../context.dart';
 
 import '../collection_equality.dart';
 import 'core.dart';
diff --git a/pkgs/checks/lib/src/extensions/math.dart b/pkgs/checks/lib/src/extensions/math.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:checks/context.dart';
+import '../../context.dart';
 
 extension NumChecks on Subject<num> {
   /// Expects that [num.isNaN] is true.
diff --git a/pkgs/checks/lib/src/extensions/string.dart b/pkgs/checks/lib/src/extensions/string.dart
@@ -4,7 +4,7 @@
 
 import 'dart:math' as math;
 
-import 'package:checks/context.dart';
+import '../../context.dart';
 
 import 'core.dart';
 
diff --git a/pkgs/checks/pubspec.yaml b/pkgs/checks/pubspec.yaml
@@ -14,5 +14,5 @@ dependencies:
   test_api: ">=0.5.0 <0.7.0"
 
 dev_dependencies:
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
   test: ^1.21.3
diff --git a/pkgs/checks/test/context_test.dart b/pkgs/checks/test/context_test.dart
@@ -88,7 +88,7 @@ void main() {
     test('nestAsync does not hold test open past exception', () async {
       late void Function() callback;
       final monitor = TestCaseMonitor.start(() {
-        check(null).context.nestAsync(() => [''], (actual) async {
+        check(null).context.nestAsync<Object?>(() => [''], (actual) async {
           final completer = Completer<void>();
           callback = completer.complete;
           await completer.future;
diff --git a/pkgs/checks/test/extensions/collection_equality_test.dart b/pkgs/checks/test/extensions/collection_equality_test.dart
@@ -148,7 +148,7 @@ void main() {
     });
 
     test('reports recursive lists', () {
-      var l = [];
+      var l = <Object>[];
       l.add(l);
       check(deepCollectionEquals(l, l))
           .isNotNull()
diff --git a/pkgs/checks/test/extensions/core_test.dart b/pkgs/checks/test/extensions/core_test.dart
@@ -99,57 +99,63 @@ void main() {
   group('ComparableChecks on Duration', () {
     group('isGreaterThan', () {
       test('succeeds for greater', () {
-        check(Duration(seconds: 10)).isGreaterThan(Duration(seconds: 1));
+        check(const Duration(seconds: 10))
+            .isGreaterThan(const Duration(seconds: 1));
       });
       test('fails for equal', () {
-        check(Duration(seconds: 10)).isRejectedBy(
-            (it) => it.isGreaterThan(Duration(seconds: 10)),
+        check(const Duration(seconds: 10)).isRejectedBy(
+            (it) => it.isGreaterThan(const Duration(seconds: 10)),
             which: ['is not greater than <0:00:10.000000>']);
       });
       test('fails for less', () {
-        check(Duration(seconds: 10)).isRejectedBy(
-            (it) => it.isGreaterThan(Duration(seconds: 50)),
+        check(const Duration(seconds: 10)).isRejectedBy(
+            (it) => it.isGreaterThan(const Duration(seconds: 50)),
             which: ['is not greater than <0:00:50.000000>']);
       });
     });
     group('isGreaterOrEqual', () {
       test('succeeds for greater', () {
-        check(Duration(seconds: 10)).isGreaterOrEqual(Duration(seconds: 1));
+        check(const Duration(seconds: 10))
+            .isGreaterOrEqual(const Duration(seconds: 1));
       });
       test('succeeds for equal', () {
-        check(Duration(seconds: 10)).isGreaterOrEqual(Duration(seconds: 10));
+        check(const Duration(seconds: 10))
+            .isGreaterOrEqual(const Duration(seconds: 10));
       });
       test('fails for less', () {
-        check(Duration(seconds: 10)).isRejectedBy(
-            (it) => it.isGreaterOrEqual(Duration(seconds: 50)),
+        check(const Duration(seconds: 10)).isRejectedBy(
+            (it) => it.isGreaterOrEqual(const Duration(seconds: 50)),
             which: ['is not greater than or equal to <0:00:50.000000>']);
       });
     });
     group('isLessThan', () {
       test('succeeds for less', () {
-        check(Duration(seconds: 1)).isLessThan(Duration(seconds: 10));
+        check(const Duration(seconds: 1))
+            .isLessThan(const Duration(seconds: 10));
       });
       test('fails for equal', () {
-        check(Duration(seconds: 10)).isRejectedBy(
-            (it) => it.isLessThan(Duration(seconds: 10)),
+        check(const Duration(seconds: 10)).isRejectedBy(
+            (it) => it.isLessThan(const Duration(seconds: 10)),
             which: ['is not less than <0:00:10.000000>']);
       });
       test('fails for greater', () {
-        check(Duration(seconds: 50)).isRejectedBy(
-            (it) => it.isLessThan(Duration(seconds: 10)),
+        check(const Duration(seconds: 50)).isRejectedBy(
+            (it) => it.isLessThan(const Duration(seconds: 10)),
             which: ['is not less than <0:00:10.000000>']);
       });
     });
     group('isLessOrEqual', () {
       test('succeeds for less', () {
-        check(Duration(seconds: 10)).isLessOrEqual(Duration(seconds: 50));
+        check(const Duration(seconds: 10))
+            .isLessOrEqual(const Duration(seconds: 50));
       });
       test('succeeds for equal', () {
-        check(Duration(seconds: 10)).isLessOrEqual(Duration(seconds: 10));
+        check(const Duration(seconds: 10))
+            .isLessOrEqual(const Duration(seconds: 10));
       });
       test('fails for greater', () {
-        check(Duration(seconds: 10)).isRejectedBy(
-            (it) => it.isLessOrEqual(Duration(seconds: 1)),
+        check(const Duration(seconds: 10)).isRejectedBy(
+            (it) => it.isLessOrEqual(const Duration(seconds: 1)),
             which: ['is not less than or equal to <0:00:01.000000>']);
       });
     });
diff --git a/pkgs/checks/test/extensions/iterable_test.dart b/pkgs/checks/test/extensions/iterable_test.dart
@@ -19,7 +19,7 @@ void main() {
       check(_testIterable).first.equals(0);
     });
     test('rejects empty iterable', () {
-      check([])
+      check(<Object>[])
           .isRejectedBy((it) => it.first.equals(0), which: ['has no elements']);
     });
   });
@@ -29,7 +29,7 @@ void main() {
       check(_testIterable).last.equals(1);
     });
     test('rejects empty iterable', () {
-      check([])
+      check(<Object>[])
           .isRejectedBy((it) => it.last.equals(0), which: ['has no elements']);
     });
   });
@@ -39,7 +39,7 @@ void main() {
       check([42]).single.equals(42);
     });
     test('rejects empty iterable', () {
-      check([]).isRejectedBy((it) => it.single.equals(0),
+      check(<Object>[]).isRejectedBy((it) => it.single.equals(0),
           which: ['has no elements']);
     });
     test('rejects iterable with too many elements', () {
@@ -49,14 +49,14 @@ void main() {
   });
 
   test('isEmpty', () {
-    check([]).isEmpty();
+    check(<Object>[]).isEmpty();
     check(_testIterable)
         .isRejectedBy((it) => it.isEmpty(), which: ['is not empty']);
   });
 
   test('isNotEmpty', () {
     check(_testIterable).isNotEmpty();
-    check(Iterable<int>.empty())
+    check(const Iterable<int>.empty())
         .isRejectedBy((it) => it.isNotEmpty(), which: ['is empty']);
   });
 
diff --git a/pkgs/checks/test/extensions/map_test.dart b/pkgs/checks/test/extensions/map_test.dart
@@ -61,7 +61,8 @@ void main() {
   });
   test('isNotEmpty', () {
     check(_testMap).isNotEmpty();
-    check({}).isRejectedBy((it) => it.isNotEmpty(), which: ['is not empty']);
+    check(<Object, Object>{})
+        .isRejectedBy((it) => it.isNotEmpty(), which: ['is not empty']);
   });
   group('containsKey', () {
     test('succeeds for a key that exists', () {
diff --git a/pkgs/checks/test/failure_message_test.dart b/pkgs/checks/test/failure_message_test.dart
@@ -16,7 +16,7 @@ Which: is not greater than <2>''');
 
     test('includes matching portions of actual', () {
       check(() {
-        check([]).length.equals(1);
+        check(<dynamic>[]).length.equals(1);
       }).throwsFailure().equals('''
 Expected: a List<dynamic> that:
   has length that:
diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml
@@ -20,7 +20,7 @@ dependencies:
 
 dev_dependencies:
   analyzer: '>=2.1.0 <7.0.0'
-  dart_flutter_team_lints: ^1.0.0
+  dart_flutter_team_lints: ^2.0.0
   fake_async: ^1.2.0
   glob: ^2.0.0
   graphs: ^2.0.0
