From ca975142ceabf1ea4d7791d58bbea7d84f74456d Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Fri, 18 Jun 2021 17:02:04 -0700
Subject: [PATCH] Refactor MultiFutureTracker to not be generic

---
 lib/src/io_utils.dart    | 9 ++++-----
 lib/src/tool_runner.dart | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/src/io_utils.dart b/lib/src/io_utils.dart
index a93dab00e5..5ade007a67 100644
--- a/lib/src/io_utils.dart
+++ b/lib/src/io_utils.dart
@@ -117,12 +117,11 @@ final RegExp partOfRegexp = RegExp('part of ');
     'as Dartdoc 1.0.0')
 final RegExp newLinePartOfRegexp = RegExp('\npart of ');
 
-/// Best used with Future<void>.
-class MultiFutureTracker<T> {
+class MultiFutureTracker {
   /// Approximate maximum number of simultaneous active Futures.
   final int parallel;
 
-  final Set<Future<T>> _trackedFutures = {};
+  final Set<Future<void>> _trackedFutures = {};
 
   MultiFutureTracker(this.parallel);
 
@@ -139,9 +138,9 @@ class MultiFutureTracker<T> {
   ///
   /// If the closure does not handle its own exceptions, other calls to
   /// [addFutureFromClosure] or [wait] may trigger an exception.
-  Future<void> addFutureFromClosure(Future<T> Function() closure) async {
+  Future<void> addFutureFromClosure(Future<void> Function() closure) async {
     await _waitUntil(parallel - 1);
-    Future<void> future = closure();
+    var future = closure();
     _trackedFutures.add(future);
     // ignore: unawaited_futures
     future.then((f) {
diff --git a/lib/src/tool_runner.dart b/lib/src/tool_runner.dart
index 23e8737fc8..e29e7a173d 100644
--- a/lib/src/tool_runner.dart
+++ b/lib/src/tool_runner.dart
@@ -19,7 +19,7 @@ typedef FakeResultCallback = String Function(String tool,
 
 /// Set a ceiling on how many tool instances can be in progress at once,
 /// limiting both parallelization and the number of open temporary files.
-final MultiFutureTracker<void> _toolTracker = MultiFutureTracker(4);
+final MultiFutureTracker _toolTracker = MultiFutureTracker(4);
 
 class ToolTempFileTracker {
   final ResourceProvider resourceProvider;