Merge pull request #2224 from cloudflare/jlee/remove-unused-waituntil

Remove unused waitUntilTasks fields
cloudflare · Jun 6, 2024 · ba344bc · ba344bc
2 parents b5b54a9 + 439a5f8
commit ba344bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/workerd/api/hibernatable-web-socket.c++ b/src/workerd/api/hibernatable-web-socket.c++
@@ -213,13 +213,13 @@ HibernatableWebSocketCustomEventImpl::HibernatableWebSocketCustomEventImpl(
     kj::TaskSet& waitUntilTasks,
     kj::Own<HibernationReader> params,
     kj::Maybe<Worker::Actor::HibernationManager&> manager)
-  : typeId(typeId), waitUntilTasks(waitUntilTasks), params(kj::mv(params)) {}
+  : typeId(typeId), params(kj::mv(params)) {}
 HibernatableWebSocketCustomEventImpl::HibernatableWebSocketCustomEventImpl(
     uint16_t typeId,
     kj::TaskSet& waitUntilTasks,
     HibernatableSocketParams params,
     Worker::Actor::HibernationManager& manager)
-  : typeId(typeId), waitUntilTasks(waitUntilTasks), params(kj::mv(params)), manager(manager) {}
+  : typeId(typeId), params(kj::mv(params)), manager(manager) {}
 
 HibernatableSocketParams HibernatableWebSocketCustomEventImpl::consumeParams() {
   KJ_IF_SOME(p, params.tryGet<kj::Own<HibernationReader>>()) {

diff --git a/src/workerd/api/hibernatable-web-socket.h b/src/workerd/api/hibernatable-web-socket.h
@@ -90,7 +90,6 @@ class HibernatableWebSocketCustomEventImpl final: public WorkerInterface::Custom
   HibernatableSocketParams consumeParams();
 
   uint16_t typeId;
-  kj::TaskSet& waitUntilTasks;
   kj::OneOf<HibernatableSocketParams, kj::Own<HibernationReader>> params;
   kj::Maybe<uint32_t> timeoutMs;
   kj::Maybe<Worker::Actor::HibernationManager&> manager;

diff --git a/src/workerd/api/trace.h b/src/workerd/api/trace.h
@@ -589,7 +589,7 @@ class TraceCustomEventImpl final: public WorkerInterface::CustomEvent {
 public:
   TraceCustomEventImpl(
       uint16_t typeId, kj::TaskSet& waitUntilTasks, kj::Array<kj::Own<Trace>> traces)
-    : typeId(typeId), waitUntilTasks(waitUntilTasks), traces(kj::mv(traces)) {}
+    : typeId(typeId), traces(kj::mv(traces)) {}
 
   kj::Promise<Result> run(
       kj::Own<IoContext::IncomingRequest> incomingRequest,
@@ -608,7 +608,6 @@ class TraceCustomEventImpl final: public WorkerInterface::CustomEvent {
 
 private:
   uint16_t typeId;
-  kj::TaskSet& waitUntilTasks;
   kj::Array<kj::Own<workerd::Trace>> traces;
 };