From 9c3c743d8ee349e26744cd6a5dc09f412e405601 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 20 Jun 2024 10:56:56 +0200 Subject: [PATCH 1/2] remove updates counter --- crates/turbo-tasks-memory/src/output.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/crates/turbo-tasks-memory/src/output.rs b/crates/turbo-tasks-memory/src/output.rs index 4b74dfe9de9e9..334c5f4642d8e 100644 --- a/crates/turbo-tasks-memory/src/output.rs +++ b/crates/turbo-tasks-memory/src/output.rs @@ -12,7 +12,6 @@ use crate::MemoryBackend; #[derive(Default, Debug)] pub struct Output { pub(crate) content: OutputContent, - updates: u32, pub(crate) dependent_tasks: TaskIdSet, } @@ -62,7 +61,6 @@ impl Output { pub fn error(&mut self, error: Error, turbo_tasks: &dyn TurboTasksBackendApi) { self.content = OutputContent::Error(SharedError::new(error)); - self.updates += 1; // notify if !self.dependent_tasks.is_empty() { turbo_tasks.schedule_notify_tasks_set(&take(&mut self.dependent_tasks)); @@ -75,7 +73,6 @@ impl Output { turbo_tasks: &dyn TurboTasksBackendApi, ) { self.content = OutputContent::Panic(message); - self.updates += 1; // notify if !self.dependent_tasks.is_empty() { turbo_tasks.schedule_notify_tasks_set(&take(&mut self.dependent_tasks)); @@ -88,7 +85,6 @@ impl Output { turbo_tasks: &dyn TurboTasksBackendApi, ) { self.content = content; - self.updates += 1; // notify if !self.dependent_tasks.is_empty() { turbo_tasks.schedule_notify_tasks_set(&take(&mut self.dependent_tasks)); From 2e70008a758fc97d44fdcaebb3d65c9f9c417f47 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Thu, 20 Jun 2024 10:59:01 +0200 Subject: [PATCH 2/2] Box panics in Tasks --- crates/turbo-tasks-memory/src/output.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/turbo-tasks-memory/src/output.rs b/crates/turbo-tasks-memory/src/output.rs index 334c5f4642d8e..43f50580c1fb7 100644 --- a/crates/turbo-tasks-memory/src/output.rs +++ b/crates/turbo-tasks-memory/src/output.rs @@ -21,7 +21,7 @@ pub enum OutputContent { Empty, Link(RawVc), Error(SharedError), - Panic(Option>), + Panic(Option>>), } impl Display for OutputContent { @@ -72,7 +72,7 @@ impl Output { message: Option>, turbo_tasks: &dyn TurboTasksBackendApi, ) { - self.content = OutputContent::Panic(message); + self.content = OutputContent::Panic(message.map(Box::new)); // notify if !self.dependent_tasks.is_empty() { turbo_tasks.schedule_notify_tasks_set(&take(&mut self.dependent_tasks));