Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,6 @@ deps = {
'src/third_party/pkg/googleapis':
Var('github_git') + '/google/googleapis.dart.git' + '@' + '07f01b7aa6985e4cafd0fd4b98724841bc9e85a1', # various

'src/third_party/pkg/isolate':
Var('github_git') + '/dart-lang/isolate.git' + '@' + 'ca133acb5af3a60a026fa2aab12b81e60048b3be', # 2.0.3

'src/third_party/pkg/platform':
Var('github_git') + '/google/platform.dart.git' + '@' + 'f63fd0bc3021354a0687dc935962c9acc003f47e', # 3.0.1

Expand Down
14 changes: 4 additions & 10 deletions ci/bin/format.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import 'dart:io';

import 'package:args/args.dart';
// ignore: import_of_legacy_library_into_null_safe
import 'package:isolate/isolate.dart';
import 'package:meta/meta.dart';
import 'package:path/path.dart' as path;
import 'package:process/process.dart';
Expand Down Expand Up @@ -706,7 +704,7 @@ class WhitespaceFormatChecker extends FormatChecker {
return true;
}

static Future<_GrepResult> _hasTrailingWhitespace(File file) async {
static _GrepResult _hasTrailingWhitespace(File file) {
final List<String> hits = <String>[];
final List<int> lineNumbers = <int>[];
int lineNumber = 0;
Expand All @@ -723,12 +721,8 @@ class WhitespaceFormatChecker extends FormatChecker {
return _GrepResult(file, hits, lineNumbers);
}

Stream<_GrepResult> _whereHasTrailingWhitespace(Iterable<File> files) async* {
final LoadBalancer pool =
await LoadBalancer.create(Platform.numberOfProcessors, IsolateRunner.spawn);
for (final File file in files) {
yield await pool.run<_GrepResult, File>(_hasTrailingWhitespace, file);
}
Iterable<_GrepResult> _whereHasTrailingWhitespace(Iterable<File> files) {
return files.map(_hasTrailingWhitespace);
}

Future<List<File>> _getWhitespaceFailures() async {
Expand Down Expand Up @@ -764,7 +758,7 @@ class WhitespaceFormatChecker extends FormatChecker {
int inProgress = Platform.numberOfProcessors;
int pending = total;
int failed = 0;
await for (final _GrepResult result in _whereHasTrailingWhitespace(
for (final _GrepResult result in _whereHasTrailingWhitespace(
files.map<File>(
(String file) => File(
path.join(repoDir.absolute.path, file),
Expand Down
3 changes: 0 additions & 3 deletions ci/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ dependencies:
args: any
meta: any
path: any
isolate: any
process_runner: any

dependency_overrides:
Expand All @@ -32,8 +31,6 @@ dependency_overrides:
path: ../../third_party/dart/third_party/pkg/collection
file:
path: ../../third_party/pkg/file/packages/file
isolate:
path: ../../third_party/pkg/isolate
meta:
path: ../../third_party/dart/pkg/meta
path:
Expand Down