From 47dff3765de863554ca296448555599fc50d4a8a Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 11 May 2023 10:50:30 +0200
Subject: Remove 'static bound on `World`

Thanks to improvements in comemo, tracked types don't need to be 'static anymore. This means that the 'static bound on the `World` is now lifted and that the `Route` doesn't need to use unsafe code anymore to manage its lifetime.
---
 library/src/layout/mod.rs | 4 ++--
 library/src/layout/par.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'library/src/layout')

diff --git a/library/src/layout/mod.rs b/library/src/layout/mod.rs
index 25014498..adfc433a 100644
--- a/library/src/layout/mod.rs
+++ b/library/src/layout/mod.rs
@@ -73,7 +73,7 @@ impl LayoutRoot for Content {
         #[comemo::memoize]
         fn cached(
             content: &Content,
-            world: Tracked<dyn World>,
+            world: Tracked<dyn World + '_>,
             tracer: TrackedMut<Tracer>,
             provider: TrackedMut<StabilityProvider>,
             introspector: Tracked<Introspector>,
@@ -139,7 +139,7 @@ impl Layout for Content {
         #[comemo::memoize]
         fn cached(
             content: &Content,
-            world: Tracked<dyn World>,
+            world: Tracked<dyn World + '_>,
             tracer: TrackedMut<Tracer>,
             provider: TrackedMut<StabilityProvider>,
             introspector: Tracked<Introspector>,
diff --git a/library/src/layout/par.rs b/library/src/layout/par.rs
index 0c3a9a3c..c7bc5359 100644
--- a/library/src/layout/par.rs
+++ b/library/src/layout/par.rs
@@ -139,7 +139,7 @@ impl ParElem {
         #[allow(clippy::too_many_arguments)]
         fn cached(
             par: &ParElem,
-            world: Tracked<dyn World>,
+            world: Tracked<dyn World + '_>,
             tracer: TrackedMut<Tracer>,
             provider: TrackedMut<StabilityProvider>,
             introspector: Tracked<Introspector>,
-- 
cgit v1.2.3