Skip to content

Commit 42eddc9

Browse files
authored
Update to latest lints, require Dart 3.2 (dart-archive/async#267)
1 parent 87293d2 commit 42eddc9

30 files changed

+178
-174
lines changed

pkgs/async/.github/workflows/test-package.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
matrix:
4848
# Add macos-latest and/or windows-latest if relevant for this package.
4949
os: [ubuntu-latest]
50-
sdk: [2.19.0, dev]
50+
sdk: [3.2, dev]
5151
steps:
5252
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
5353
- uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3

pkgs/async/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 2.12.0-wip
22

3-
- Require Dart 2.19
3+
- Require Dart 3.2
44

55
## 2.11.0
66

pkgs/async/analysis_options.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://dart.dev/guides/language/analysis-options
1+
# https://dart.dev/tools/analysis#the-analysis-options-file
22
include: package:dart_flutter_team_lints/analysis_options.yaml
33

44
analyzer:
@@ -7,16 +7,15 @@ analyzer:
77
errors:
88
only_throw_errors: ignore
99
unawaited_futures: ignore
10+
inference_failure_on_instance_creation: ignore
11+
inference_failure_on_function_invocation: ignore
12+
inference_failure_on_collection_literal: ignore
1013

1114
linter:
1215
rules:
1316
- avoid_unused_constructor_parameters
14-
- comment_references
1517
- literal_only_boolean_expressions
1618
- missing_whitespace_between_adjacent_strings
1719
- no_adjacent_strings_in_list
1820
- no_runtimeType_toString
1921
- package_api_docs
20-
- prefer_relative_imports
21-
- test_types_in_equals
22-
- use_super_parameters

pkgs/async/lib/src/subscription_stream.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class _CancelOnErrorSubscriptionWrapper<T>
7373
@override
7474
void onError(Function? handleError) {
7575
// Cancel when receiving an error.
76-
super.onError((error, StackTrace stackTrace) {
76+
super.onError((Object error, StackTrace stackTrace) {
7777
// Wait for the cancel to complete before sending the error event.
7878
super.cancel().whenComplete(() {
7979
if (handleError is ZoneBinaryCallback) {

pkgs/async/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ description: Utility functions and classes related to the 'dart:async' library.
44
repository: https://github.com/dart-lang/async
55

66
environment:
7-
sdk: '>=2.19.0 <4.0.0'
7+
sdk: ^3.2.0
88

99
dependencies:
1010
collection: ^1.15.0
1111
meta: ^1.1.7
1212

1313
dev_dependencies:
14-
dart_flutter_team_lints: ^1.0.0
14+
dart_flutter_team_lints: ^2.0.0
1515
fake_async: ^1.2.0
1616
stack_trace: ^1.10.0
1717
test: ^1.16.0

pkgs/async/test/async_cache_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void main() {
6060
Future<String> throwingCall() async => throw Exception();
6161
await expectLater(cache.fetch(throwingCall), throwsA(isException));
6262
// To let the timer invalidate the cache
63-
await Future.delayed(Duration(milliseconds: 5));
63+
await Future<void>.delayed(const Duration(milliseconds: 5));
6464

6565
Future<String> call() async => 'Completed';
6666
expect(await cache.fetch(call), 'Completed', reason: 'Cache invalidates');

pkgs/async/test/cancelable_operation_test.dart

+18-16
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ void main() {
105105
});
106106

107107
test('is not complete until the result is available', () async {
108-
var backingWork = Completer();
108+
var backingWork = Completer<void>();
109109
var operation = CancelableOperation.fromFuture(backingWork.future);
110110
expect(operation.isCompleted, isFalse);
111111
backingWork.complete();
@@ -132,17 +132,19 @@ void main() {
132132

133133
test('successfully then with a future', () {
134134
completer.complete(1);
135-
expect(() => completer.complete(Completer().future), throwsStateError);
135+
expect(() => completer.complete(Completer<void>().future),
136+
throwsStateError);
136137
});
137138

138139
test('with a future then successfully', () {
139-
completer.complete(Completer().future);
140+
completer.complete(Completer<void>().future);
140141
expect(() => completer.complete(1), throwsStateError);
141142
});
142143

143144
test('with a future twice', () {
144-
completer.complete(Completer().future);
145-
expect(() => completer.complete(Completer().future), throwsStateError);
145+
completer.complete(Completer<void>().future);
146+
expect(() => completer.complete(Completer<void>().future),
147+
throwsStateError);
146148
});
147149
});
148150

@@ -185,7 +187,7 @@ void main() {
185187

186188
group('when canceled', () {
187189
test('causes the future never to fire', () async {
188-
var completer = CancelableCompleter();
190+
var completer = CancelableCompleter<void>();
189191
completer.operation.value.whenComplete(expectAsync0(() {}, count: 0));
190192
completer.operation.cancel();
191193

@@ -242,7 +244,7 @@ void main() {
242244
'does call onCancel if the completer has completed to an unfired '
243245
'Future', () {
244246
var completer = CancelableCompleter(onCancel: expectAsync0(() {}));
245-
completer.complete(Completer().future);
247+
completer.complete(Completer<void>().future);
246248
expect(completer.operation.cancel(), completes);
247249
});
248250

@@ -257,15 +259,15 @@ void main() {
257259
});
258260

259261
test('can be completed once after being canceled', () async {
260-
var completer = CancelableCompleter();
262+
var completer = CancelableCompleter<int>();
261263
completer.operation.value.whenComplete(expectAsync0(() {}, count: 0));
262264
await completer.operation.cancel();
263265
completer.complete(1);
264266
expect(() => completer.complete(1), throwsStateError);
265267
});
266268

267269
test('fires valueOrCancellation with the given value', () {
268-
var completer = CancelableCompleter();
270+
var completer = CancelableCompleter<int>();
269271
expect(completer.operation.valueOrCancellation(1), completion(equals(1)));
270272
completer.operation.cancel();
271273
});
@@ -279,7 +281,7 @@ void main() {
279281
});
280282

281283
test('valueOrCancellation waits on the onCancel future', () async {
282-
var innerCompleter = Completer();
284+
var innerCompleter = Completer<void>();
283285
var completer =
284286
CancelableCompleter(onCancel: () => innerCompleter.future);
285287

@@ -389,13 +391,13 @@ void main() {
389391

390392
group('asStream()', () {
391393
test('emits a value and then closes', () {
392-
var completer = CancelableCompleter();
394+
var completer = CancelableCompleter<int>();
393395
expect(completer.operation.asStream().toList(), completion(equals([1])));
394396
completer.complete(1);
395397
});
396398

397399
test('emits an error and then closes', () {
398-
var completer = CancelableCompleter();
400+
var completer = CancelableCompleter<void>();
399401
var queue = StreamQueue(completer.operation.asStream());
400402
expect(queue.next, throwsA('error'));
401403
expect(queue.hasNext, completion(isFalse));
@@ -425,7 +427,7 @@ void main() {
425427
onError = expectAsync2((e, s) => 'Fake', count: 0, id: 'onError');
426428
onCancel = expectAsync0(() => 'Fake', count: 0, id: 'onCancel');
427429
propagateCancel = false;
428-
originalCompleter = CancelableCompleter();
430+
originalCompleter = CancelableCompleter<int>();
429431
});
430432

431433
CancelableOperation<String> runThen() {
@@ -574,8 +576,8 @@ void main() {
574576
test('waits for chained cancellation', () async {
575577
var completer = CancelableCompleter<void>();
576578
var chainedOperation = completer.operation
577-
.then((_) => Future.delayed(Duration(milliseconds: 1)))
578-
.then((_) => Future.delayed(Duration(milliseconds: 1)));
579+
.then((_) => Future<void>.delayed(const Duration(milliseconds: 1)))
580+
.then((_) => Future<void>.delayed(const Duration(milliseconds: 1)));
579581

580582
await completer.operation.cancel();
581583
expect(completer.operation.isCanceled, true);
@@ -655,7 +657,7 @@ void main() {
655657
onError = null;
656658
onCancel = null;
657659
propagateCancel = false;
658-
originalCompleter = CancelableCompleter();
660+
originalCompleter = CancelableCompleter<int>();
659661
});
660662

661663
CancelableOperation<String> runThenOperation() {

pkgs/async/test/chunked_stream_reader.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ void main() {
342342
final r = ChunkedStreamReader(() async* {
343343
yield [1, 2, 3];
344344
// This will hang forever, so we will call cancel()
345-
await Completer().future;
345+
await Completer<void>().future;
346346
yield [4]; // this should never be reachable
347347
fail('unreachable!');
348348
}());
@@ -362,7 +362,7 @@ void main() {
362362
final r = ChunkedStreamReader(() async* {
363363
yield [1, 2, 3];
364364
// This will hang forever, so we will call cancel()
365-
await Completer().future;
365+
await Completer<void>().future;
366366
yield [4]; // this should never be reachable
367367
fail('unreachable!');
368368
}());

pkgs/async/test/future_group_test.dart

+15-15
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ void main() {
6767
});
6868

6969
test('completes once all contained futures complete', () async {
70-
var completer1 = Completer();
71-
var completer2 = Completer();
72-
var completer3 = Completer();
70+
var completer1 = Completer<void>();
71+
var completer2 = Completer<void>();
72+
var completer3 = Completer<void>();
7373

7474
futureGroup.add(completer1.future);
7575
futureGroup.add(completer2.future);
@@ -93,9 +93,9 @@ void main() {
9393
});
9494

9595
test('completes to the values of the futures in order of addition', () {
96-
var completer1 = Completer();
97-
var completer2 = Completer();
98-
var completer3 = Completer();
96+
var completer1 = Completer<int>();
97+
var completer2 = Completer<int>();
98+
var completer3 = Completer<int>();
9999

100100
futureGroup.add(completer1.future);
101101
futureGroup.add(completer2.future);
@@ -112,9 +112,9 @@ void main() {
112112

113113
test("completes to the first error to be emitted, even if it's not closed",
114114
() {
115-
var completer1 = Completer();
116-
var completer2 = Completer();
117-
var completer3 = Completer();
115+
var completer1 = Completer<void>();
116+
var completer2 = Completer<void>();
117+
var completer3 = Completer<void>();
118118

119119
futureGroup.add(completer1.future);
120120
futureGroup.add(completer2.future);
@@ -130,9 +130,9 @@ void main() {
130130
var idle = false;
131131
futureGroup.onIdle.listen((_) => idle = true);
132132

133-
var completer1 = Completer();
134-
var completer2 = Completer();
135-
var completer3 = Completer();
133+
var completer1 = Completer<void>();
134+
var completer2 = Completer<void>();
135+
var completer3 = Completer<void>();
136136

137137
futureGroup.add(completer1.future);
138138
futureGroup.add(completer2.future);
@@ -162,7 +162,7 @@ void main() {
162162
var idle = false;
163163
futureGroup.onIdle.listen((_) => idle = true);
164164

165-
var completer = Completer();
165+
var completer = Completer<void>();
166166
futureGroup.add(completer.future);
167167

168168
completer.complete();
@@ -171,7 +171,7 @@ void main() {
171171
expect(futureGroup.isIdle, isTrue);
172172

173173
idle = false;
174-
completer = Completer();
174+
completer = Completer<void>();
175175
futureGroup.add(completer.future);
176176

177177
await flushMicrotasks();
@@ -206,7 +206,7 @@ void main() {
206206
futureFired = true;
207207
}));
208208

209-
var completer = Completer();
209+
var completer = Completer<void>();
210210
futureGroup.add(completer.future);
211211
futureGroup.close();
212212

pkgs/async/test/lazy_stream_test.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void main() {
1414
var callbackCalled = false;
1515
var stream = LazyStream(expectAsync0(() {
1616
callbackCalled = true;
17-
return Stream.empty();
17+
return const Stream.empty();
1818
}));
1919

2020
await flushMicrotasks();
@@ -28,7 +28,7 @@ void main() {
2828
var callbackCalled = false;
2929
var stream = LazyStream(expectAsync0(() {
3030
callbackCalled = true;
31-
return Stream.empty();
31+
return const Stream.empty();
3232
}));
3333

3434
await flushMicrotasks();
@@ -95,7 +95,7 @@ void main() {
9595
late LazyStream stream;
9696
stream = LazyStream(expectAsync0(() {
9797
expect(() => stream.listen(null), throwsStateError);
98-
return Stream.empty();
98+
return const Stream.empty();
9999
}));
100100
stream.listen(null);
101101
});

pkgs/async/test/null_stream_sink_test.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main() {
1717
});
1818

1919
test('a custom future may be passed to done', () async {
20-
var completer = Completer();
20+
var completer = Completer<void>();
2121
var sink = NullStreamSink(done: completer.future);
2222

2323
var doneFired = false;
@@ -51,7 +51,7 @@ void main() {
5151

5252
expect(() => sink.add(1), throwsStateError);
5353
expect(() => sink.addError('oh no'), throwsStateError);
54-
expect(() => sink.addStream(Stream.empty()), throwsStateError);
54+
expect(() => sink.addStream(const Stream.empty()), throwsStateError);
5555
});
5656

5757
group('addStream', () {
@@ -68,7 +68,7 @@ void main() {
6868
});
6969

7070
test('returns the cancel future', () async {
71-
var completer = Completer();
71+
var completer = Completer<void>();
7272
var sink = NullStreamSink();
7373
var controller = StreamController(onCancel: () => completer.future);
7474

@@ -93,15 +93,15 @@ void main() {
9393
test('causes events to throw StateErrors until the future completes',
9494
() async {
9595
var sink = NullStreamSink();
96-
var future = sink.addStream(Stream.empty());
96+
var future = sink.addStream(const Stream.empty());
9797
expect(() => sink.add(1), throwsStateError);
9898
expect(() => sink.addError('oh no'), throwsStateError);
99-
expect(() => sink.addStream(Stream.empty()), throwsStateError);
99+
expect(() => sink.addStream(const Stream.empty()), throwsStateError);
100100

101101
await future;
102102
sink.add(1);
103103
sink.addError('oh no');
104-
expect(sink.addStream(Stream.empty()), completes);
104+
expect(sink.addStream(const Stream.empty()), completes);
105105
});
106106
});
107107
});

0 commit comments

Comments
 (0)