Skip to content

Commit 71c9cc1

Browse files
authored
Bump dart_flutter_team lints to latest across packages (#1679)
1 parent febccb9 commit 71c9cc1

22 files changed

+360
-268
lines changed

.github/workflows/bazel_worker.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jobs:
3636
- uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
3737
with:
3838
sdk: ${{ matrix.sdk }}
39+
- run: dart pub get
3940
- run: "dart format --output=none --set-exit-if-changed ."
41+
if: ${{ matrix.sdk == dev }}
4042
- name: Test
4143
run: ./tool/travis.sh

pkgs/bazel_worker/benchmark/benchmark.dart

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ Future<void> main() async {
1212
var path = 'blaze-bin/some/path/to/a/file/that/is/an/input/$i';
1313
workRequest
1414
..arguments.add('--input=$path')
15-
..inputs.add(Input(
16-
path: '',
17-
digest: List.filled(70, 0x11),
18-
));
15+
..inputs.add(Input(path: '', digest: List.filled(70, 0x11)));
1916
}
2017

2118
// Serialize it.
@@ -24,14 +21,20 @@ Future<void> main() async {
2421
print('Request has $length requestBytes.');
2522

2623
// Add the length in front base 128 encoded as in the worker protocol.
27-
requestBytes =
28-
Uint8List.fromList(requestBytes.toList()..insertAll(0, _varInt(length)));
24+
requestBytes = Uint8List.fromList(
25+
requestBytes.toList()..insertAll(0, _varInt(length)),
26+
);
2927

3028
// Split into 10000 byte chunks.
3129
var lists = <Uint8List>[];
3230
for (var i = 0; i < requestBytes.length; i += 10000) {
33-
lists.add(Uint8List.sublistView(
34-
requestBytes, i, min(i + 10000, requestBytes.length)));
31+
lists.add(
32+
Uint8List.sublistView(
33+
requestBytes,
34+
i,
35+
min(i + 10000, requestBytes.length),
36+
),
37+
);
3538
}
3639

3740
// Time `AsyncMessageGrouper` and deserialization.

pkgs/bazel_worker/e2e_test/bin/async_worker_in_isolate.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ import 'package:e2e_test/forwards_to_isolate_async_worker.dart';
1717
Future main(List<String> args, [SendPort? message]) async {
1818
var receivePort = ReceivePort();
1919
await Isolate.spawnUri(
20-
Uri.file('async_worker.dart'), [], receivePort.sendPort);
20+
Uri.file('async_worker.dart'),
21+
[],
22+
receivePort.sendPort,
23+
);
2124

2225
var worker = await ForwardsToIsolateAsyncWorker.create(receivePort);
2326
await worker.run();

pkgs/bazel_worker/e2e_test/lib/async_worker.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ class ExampleAsyncWorker extends AsyncWorkerLoop {
1616

1717
@override
1818
Future<WorkResponse> performRequest(WorkRequest request) async {
19-
return WorkResponse(
20-
exitCode: 0,
21-
output: request.arguments.join('\n'),
22-
);
19+
return WorkResponse(exitCode: 0, output: request.arguments.join('\n'));
2320
}
2421
}

pkgs/bazel_worker/e2e_test/lib/forwards_to_isolate_async_worker.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ class ForwardsToIsolateAsyncWorker extends AsyncWorkerLoop {
1313
final IsolateDriverConnection _isolateDriverConnection;
1414

1515
static Future<ForwardsToIsolateAsyncWorker> create(
16-
ReceivePort receivePort) async {
16+
ReceivePort receivePort,
17+
) async {
1718
return ForwardsToIsolateAsyncWorker(
18-
await IsolateDriverConnection.create(receivePort));
19+
await IsolateDriverConnection.create(receivePort),
20+
);
1921
}
2022

2123
ForwardsToIsolateAsyncWorker(this._isolateDriverConnection);

pkgs/bazel_worker/e2e_test/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dependencies:
1010

1111
dev_dependencies:
1212
cli_util: ^0.4.2
13-
dart_flutter_team_lints: ^1.0.0
13+
dart_flutter_team_lints: ^3.0.0
1414
path: ^1.8.0
1515
test: ^1.16.0

pkgs/bazel_worker/e2e_test/test/e2e_test.dart

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ import 'package:test/test.dart';
1212

1313
void main() {
1414
var dart = p.join(sdkPath, 'bin', 'dart');
15-
runE2eTestForWorker('sync worker',
16-
() => Process.start(dart, [p.join('bin', 'sync_worker.dart')]));
17-
runE2eTestForWorker('async worker',
18-
() => Process.start(dart, [p.join('bin', 'async_worker.dart')]));
1915
runE2eTestForWorker(
20-
'async worker in isolate',
21-
() =>
22-
Process.start(dart, [p.join('bin', 'async_worker_in_isolate.dart')]));
16+
'sync worker',
17+
() => Process.start(dart, [p.join('bin', 'sync_worker.dart')]),
18+
);
19+
runE2eTestForWorker(
20+
'async worker',
21+
() => Process.start(dart, [p.join('bin', 'async_worker.dart')]),
22+
);
23+
runE2eTestForWorker(
24+
'async worker in isolate',
25+
() => Process.start(dart, [p.join('bin', 'async_worker_in_isolate.dart')]),
26+
);
2327
}
2428

2529
void runE2eTestForWorker(String groupName, SpawnWorker spawnWorker) {

pkgs/bazel_worker/example/client.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ import 'package:bazel_worker/driver.dart';
55
void main() async {
66
var scratchSpace = await Directory.systemTemp.createTemp();
77
var driver = BazelWorkerDriver(
8-
() => Process.start(Platform.resolvedExecutable,
9-
[Platform.script.resolve('worker.dart').toFilePath()],
10-
workingDirectory: scratchSpace.path),
11-
maxWorkers: 4);
8+
() => Process.start(
9+
Platform.resolvedExecutable,
10+
[
11+
Platform.script.resolve('worker.dart').toFilePath(),
12+
],
13+
workingDirectory: scratchSpace.path),
14+
maxWorkers: 4,
15+
);
1216
var response = await driver.doWork(WorkRequest(arguments: ['foo']));
1317
if (response.exitCode != EXIT_CODE_OK) {
1418
print('Worker request failed');

pkgs/bazel_worker/lib/src/async_message_grouper.dart

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,18 @@ class AsyncMessageGrouper implements MessageGrouper {
8686
// Copy as much as possible from the input buffer. Limit is the
8787
// smaller of the remaining length to fill in the message and the
8888
// remaining length in the buffer.
89-
var lengthToCopy = min(_message.length - _messagePos,
90-
_inputBuffer.length - _inputBufferPos);
89+
var lengthToCopy = min(
90+
_message.length - _messagePos,
91+
_inputBuffer.length - _inputBufferPos,
92+
);
9193
_message.setRange(
92-
_messagePos,
93-
_messagePos + lengthToCopy,
94-
_inputBuffer.sublist(
95-
_inputBufferPos, _inputBufferPos + lengthToCopy));
94+
_messagePos,
95+
_messagePos + lengthToCopy,
96+
_inputBuffer.sublist(
97+
_inputBufferPos,
98+
_inputBufferPos + lengthToCopy,
99+
),
100+
);
96101
_messagePos += lengthToCopy;
97102
_inputBufferPos += lengthToCopy;
98103

pkgs/bazel_worker/lib/src/driver/driver.dart

Lines changed: 58 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ class BazelWorkerDriver {
4444
/// Factory method that spawns a worker process.
4545
final SpawnWorker _spawnWorker;
4646

47-
BazelWorkerDriver(this._spawnWorker,
48-
{int? maxIdleWorkers, int? maxWorkers, int? maxRetries})
49-
: _maxIdleWorkers = maxIdleWorkers ?? 4,
47+
BazelWorkerDriver(
48+
this._spawnWorker, {
49+
int? maxIdleWorkers,
50+
int? maxWorkers,
51+
int? maxRetries,
52+
}) : _maxIdleWorkers = maxIdleWorkers ?? 4,
5053
_maxWorkers = maxWorkers ?? 4,
5154
_maxRetries = maxRetries ?? 4;
5255

@@ -56,8 +59,10 @@ class BazelWorkerDriver {
5659
/// [request] has been actually sent to the worker. This allows the caller
5760
/// to determine when actual work is being done versus just waiting for an
5861
/// available worker.
59-
Future<WorkResponse> doWork(WorkRequest request,
60-
{void Function(Future<WorkResponse?>)? trackWork}) {
62+
Future<WorkResponse> doWork(
63+
WorkRequest request, {
64+
void Function(Future<WorkResponse?>)? trackWork,
65+
}) {
6166
var attempt = _WorkAttempt(request, trackWork: trackWork);
6267
_workQueue.add(attempt);
6368
_runWorkQueue();
@@ -69,9 +74,11 @@ class BazelWorkerDriver {
6974
for (var worker in _readyWorkers.toList()) {
7075
_killWorker(worker);
7176
}
72-
await Future.wait(_spawningWorkers.map((worker) async {
73-
_killWorker(await worker);
74-
}));
77+
await Future.wait(
78+
_spawningWorkers.map((worker) async {
79+
_killWorker(await worker);
80+
}),
81+
);
7582
}
7683

7784
/// Runs as many items in [_workQueue] as possible given the number of
@@ -88,8 +95,10 @@ class BazelWorkerDriver {
8895
if (_workQueue.isEmpty) return;
8996
if (_numWorkers == _maxWorkers && _idleWorkers.isEmpty) return;
9097
if (_numWorkers > _maxWorkers) {
91-
throw StateError('Internal error, created to many workers. Please '
92-
'file a bug at https://github.com/dart-lang/bazel_worker/issues/new');
98+
throw StateError(
99+
'Internal error, created to many workers. Please '
100+
'file a bug at https://github.com/dart-lang/bazel_worker/issues/new',
101+
);
93102
}
94103

95104
// At this point we definitely want to run a task, we just need to decide
@@ -137,48 +146,51 @@ class BazelWorkerDriver {
137146
void _runWorker(Process worker, _WorkAttempt attempt) {
138147
var rescheduled = false;
139148

140-
runZonedGuarded(() async {
141-
var connection = _workerConnections[worker]!;
149+
runZonedGuarded(
150+
() async {
151+
var connection = _workerConnections[worker]!;
142152

143-
connection.writeRequest(attempt.request);
144-
var responseFuture = connection.readResponse();
145-
if (attempt.trackWork != null) {
146-
attempt.trackWork!(responseFuture);
147-
}
148-
var response = await responseFuture;
149-
150-
// It is possible for us to complete with an error response due to an
151-
// unhandled async error before we get here.
152-
if (!attempt.responseCompleter.isCompleted) {
153-
if (response.exitCode == EXIT_CODE_BROKEN_PIPE) {
153+
connection.writeRequest(attempt.request);
154+
var responseFuture = connection.readResponse();
155+
if (attempt.trackWork != null) {
156+
attempt.trackWork!(responseFuture);
157+
}
158+
var response = await responseFuture;
159+
160+
// It is possible for us to complete with an error response due to an
161+
// unhandled async error before we get here.
162+
if (!attempt.responseCompleter.isCompleted) {
163+
if (response.exitCode == EXIT_CODE_BROKEN_PIPE) {
164+
rescheduled = _tryReschedule(attempt);
165+
if (rescheduled) return;
166+
stderr.writeln('Failed to run request ${attempt.request}');
167+
response = WorkResponse(
168+
exitCode: EXIT_CODE_ERROR,
169+
output:
170+
'Invalid response from worker, this probably means it wrote '
171+
'invalid output or died.',
172+
);
173+
}
174+
attempt.responseCompleter.complete(response);
175+
_cleanUp(worker);
176+
}
177+
},
178+
(e, s) {
179+
// Note that we don't need to do additional cleanup here on failures. If
180+
// the worker dies that is already handled in a generic fashion, we just
181+
// need to make sure we complete with a valid response.
182+
if (!attempt.responseCompleter.isCompleted) {
154183
rescheduled = _tryReschedule(attempt);
155184
if (rescheduled) return;
156-
stderr.writeln('Failed to run request ${attempt.request}');
157-
response = WorkResponse(
185+
var response = WorkResponse(
158186
exitCode: EXIT_CODE_ERROR,
159-
output:
160-
'Invalid response from worker, this probably means it wrote '
161-
'invalid output or died.',
187+
output: 'Error running worker:\n$e\n$s',
162188
);
189+
attempt.responseCompleter.complete(response);
190+
_cleanUp(worker);
163191
}
164-
attempt.responseCompleter.complete(response);
165-
_cleanUp(worker);
166-
}
167-
}, (e, s) {
168-
// Note that we don't need to do additional cleanup here on failures. If
169-
// the worker dies that is already handled in a generic fashion, we just
170-
// need to make sure we complete with a valid response.
171-
if (!attempt.responseCompleter.isCompleted) {
172-
rescheduled = _tryReschedule(attempt);
173-
if (rescheduled) return;
174-
var response = WorkResponse(
175-
exitCode: EXIT_CODE_ERROR,
176-
output: 'Error running worker:\n$e\n$s',
177-
);
178-
attempt.responseCompleter.complete(response);
179-
_cleanUp(worker);
180-
}
181-
});
192+
},
193+
);
182194
}
183195

184196
/// Performs post-work cleanup for [worker].

0 commit comments

Comments
 (0)