Rename toybox-msg to toybox-bus; Make MessageBus::poll,poll_consume borrow less

Author: manpat

Cargo.toml

@@ -3,14 +3,14 @@ resolver = "2"
 members = [
 	"gl",
 	"toybox",
-	"toybox-host",
-	"toybox-gfx",
 	"toybox-audio",
-	"toybox-input",
-	"toybox-egui",
+	"toybox-bus",
 	"toybox-cfg",
+	"toybox-egui",
+	"toybox-gfx",
+	"toybox-host",
+	"toybox-input",
 	"toybox-vfs",
-	"toybox-msg",
 ]
 
 [workspace.package]
@@ -37,7 +37,7 @@ toybox-input = { path = "toybox-input" }
 toybox-egui = { path = "toybox-egui" }
 toybox-cfg = { path = "toybox-cfg" }
 toybox-vfs = { path = "toybox-vfs" }
-toybox-msg = { path = "toybox-msg" }
+toybox-bus = { path = "toybox-bus" }
 
 gl = { path = "gl" }
 

toybox-msg/Cargo.toml renamed to toybox-bus/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "toybox-msg"
+name = "toybox-bus"
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

toybox-msg/src/lib.rs renamed to toybox-bus/src/lib.rs

@@ -49,7 +49,7 @@ impl MessageBus {
         self.count(subscription) > 0
     }
 
-    pub fn poll<T: Clone + 'static>(&self, subscription: &Subscription<T>) -> impl Iterator<Item=T> + use<'_, T> {
+    pub fn poll<'sub, T: Clone + 'static>(&self, subscription: &'sub Subscription<T>) -> impl Iterator<Item=T> + use<'sub, T> {
         struct Iter<'s, T: Clone + 'static> {
             subscription: Rc<SubscriptionInner>,
             queue: *mut TypedMessageQueue<T>,
@@ -86,11 +86,11 @@ impl MessageBus {
             subscription: subscription.inner.clone(),
             queue,
             _lock: MessageQueuePollLock::lock(queue),
-            _phantom: PhantomData,
+            _phantom: PhantomData::<&'sub ()>,
         }
     }
 
-    pub fn poll_consume<T: 'static>(&self, subscription: &Subscription<T>) -> impl Iterator<Item=T> + use<'_, T> {
+    pub fn poll_consume<'sub, T: 'static>(&self, subscription: &'sub Subscription<T>) -> impl Iterator<Item=T> + use<'sub, T> {
         struct Iter<'s, T: 'static> {
             subscription: Rc<SubscriptionInner>,
             queue: *mut TypedMessageQueue<T>,
@@ -130,7 +130,7 @@ impl MessageBus {
             subscription: subscription.inner.clone(),
             queue,
             lock: MessageQueuePollLock::lock(queue),
-            _phantom: PhantomData,
+            _phantom: PhantomData::<&'sub ()>,
         }
     }
 

toybox-msg/src/test.rs renamed to toybox-bus/src/test.rs

@@ -13,7 +13,7 @@ toybox-input.workspace = true
 toybox-egui.workspace = true
 toybox-cfg.workspace = true
 toybox-vfs.workspace = true
-toybox-msg.workspace = true
+toybox-bus.workspace = true
 
 
 common.workspace = true

toybox/Cargo.toml

@@ -7,6 +7,7 @@ pub struct Context {
 	pub egui: egui::Context,
 	pub cfg: cfg::Config,
 	pub vfs: vfs::Vfs,
+	pub bus: bus::MessageBus,
 
 	pub(super) egui_integration: egui_backend::Integration,
 
@@ -25,6 +26,7 @@ impl Context {
 	pub(crate) fn prepare_frame(&mut self) {
 		self.audio.update();
 		self.input.reset_tracker();
+		self.bus.garbage_collect();
 	}
 
 	// Called after events are processed, immediately before control is passed to the app.

toybox/src/context.rs

@@ -53,6 +53,7 @@ pub fn run_with_settings<F, A>(settings: host::Settings<'_>, start_app: F) -> an
 
 		gfx.resize(backbuffer_size);
 
+		let bus = bus::MessageBus::new();
 		let input = input::System::new(host.window.clone());
 
 		let egui = egui::Context::default();
@@ -65,6 +66,7 @@ pub fn run_with_settings<F, A>(settings: host::Settings<'_>, start_app: F) -> an
 			egui,
 			cfg,
 			vfs,
+			bus,
 
 			egui_integration,
 			egui_claiming_input_gate: Gate::new(),

toybox/src/lib.rs

@@ -10,7 +10,7 @@ pub use toybox_audio as audio;
 pub use toybox_input as input;
 pub use toybox_egui as egui_backend;
 pub use toybox_vfs as vfs;
-pub use toybox_msg as msg;
+pub use toybox_bus as bus;
 
 pub use host::prelude::*;
 pub use gfx::prelude::*;