clean: remove lazy_static

Author: technobaboo

Cargo.lock

@@ -71,7 +71,6 @@ bevy_render = { git = "https://github.com/Schmarni-Dev/bevy", branch = "render_t
 [dependencies]
 # small utility thingys
 nanoid = "0.4.0"
-lazy_static = "1.5.0"
 rand = "0.9.2"
 rustc-hash = "2.0.0"
 slotmap = "1.0.7"

Cargo.toml

@@ -357,15 +357,15 @@ fn generate_alias_info(aspect: &Aspect) -> TokenStream {
 		.fold(quote!(), |a, b| quote!(#a + #b));
 
 	quote! {
-		lazy_static::lazy_static! {
-			#[allow(clippy::all)]
-			pub static ref #aspect_alias_info_name: crate::nodes::alias::AliasInfo = crate::nodes::alias::AliasInfo {
+		#[allow(clippy::all)]
+		pub static #aspect_alias_info_name: std::sync::LazyLock<crate::nodes::alias::AliasInfo> = std::sync::LazyLock::new(|| {
+			crate::nodes::alias::AliasInfo {
 				server_signals: vec![#local_signals],
 				server_methods: vec![#local_methods],
 				client_signals: vec![#remote_signals],
 			}
-			#inherits;
-		}
+			#inherits
+		});
 	}
 }
 

codegen/src/lib.rs

@@ -12,7 +12,6 @@ use crate::{
 };
 use color_eyre::eyre::{Result, eyre};
 use global_counter::primitive::exact::CounterU32;
-use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use rustc_hash::FxHashMap;
 use stardust_xr_wire::messenger::{self, MessageSenderHandle};
@@ -21,17 +20,18 @@ use std::{
 	fs,
 	iter::FromIterator,
 	path::PathBuf,
-	sync::{Arc, OnceLock},
+	sync::{Arc, LazyLock, OnceLock},
 	time::Instant,
 };
 use tokio::{net::UnixStream, sync::watch, task::JoinHandle};
 use tracing::info;
 
 pub static CLIENTS: OwnedRegistry<Client> = OwnedRegistry::new();
 
-lazy_static! {
-	static ref INTERNAL_CLIENT_MESSAGE_TIMES: (watch::Sender<Instant>, watch::Receiver<Instant>) = watch::channel(Instant::now());
-	pub static ref INTERNAL_CLIENT: Arc<Client> = CLIENTS.add(Client {
+static INTERNAL_CLIENT_MESSAGE_TIMES: LazyLock<(watch::Sender<Instant>, watch::Receiver<Instant>)> =
+	LazyLock::new(|| watch::channel(Instant::now()));
+pub static INTERNAL_CLIENT: LazyLock<Arc<Client>> = LazyLock::new(|| {
+	CLIENTS.add(Client {
 		pid: None,
 		// env: None,
 		exe: None,
@@ -47,8 +47,8 @@ lazy_static! {
 		root: OnceLock::new(),
 		base_resource_prefixes: Default::default(),
 		state: OnceLock::default(),
-	});
-}
+	})
+});
 pub fn tick_internal_client() {
 	let _ = INTERNAL_CLIENT_MESSAGE_TIMES.0.send(Instant::now());
 }
@@ -63,7 +63,7 @@ pub fn get_env(pid: i32) -> Result<FxHashMap<String, String>, std::io::Error> {
 }
 pub fn state(env: &FxHashMap<String, String>) -> Option<Arc<ClientStateParsed>> {
 	let token = env.get("STARDUST_STARTUP_TOKEN")?;
-	CLIENT_STATES.lock().get(token).cloned()
+	CLIENT_STATES.get(token).as_deref().cloned()
 }
 
 pub struct Client {

src/core/client.rs

@@ -3,19 +3,18 @@ use crate::{
 	core::Id,
 	nodes::{Node, root::ClientState, spatial::Spatial},
 };
+use dashmap::DashMap;
 use glam::Mat4;
-use parking_lot::Mutex;
 use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 use std::{
 	path::{Path, PathBuf},
 	process::Command,
-	sync::Arc,
+	sync::{Arc, LazyLock},
 };
 
-lazy_static::lazy_static! {
-	pub static ref CLIENT_STATES: Mutex<FxHashMap<String, Arc<ClientStateParsed>>> = Default::default();
-}
+pub static CLIENT_STATES: LazyLock<DashMap<String, Arc<ClientStateParsed>>> =
+	LazyLock::new(Default::default);
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct LaunchInfo {
@@ -62,7 +61,7 @@ impl ClientStateParsed {
 
 	pub fn token(self) -> String {
 		let token = nanoid::nanoid!();
-		CLIENT_STATES.lock().insert(token.clone(), Arc::new(self));
+		CLIENT_STATES.insert(token.clone(), Arc::new(self));
 		token
 	}
 	pub fn from_file(file: &Path) -> Option<Self> {

src/core/client_state.rs

@@ -22,9 +22,9 @@ use bevy::gizmos::gizmos::Gizmos;
 use bevy::gizmos::primitives::dim3::GizmoPrimitive3d;
 use bevy::math::primitives::{Cylinder, Torus};
 use color_eyre::eyre::OptionExt;
+use dashmap::DashMap;
 use glam::{Vec3, Vec3A, Vec3Swizzles, vec2, vec3, vec3a};
 use parking_lot::Mutex;
-use rustc_hash::FxHashMap;
 use stardust_xr_wire::values::Vector3;
 use std::sync::{Arc, LazyLock, Weak};
 use zbus::interface;
@@ -135,9 +135,7 @@ static FIELD_REGISTRY_DEBUG_GIZMOS: Registry<Field> = Registry::new();
 
 stardust_xr_server_codegen::codegen_field_protocol!();
 
-lazy_static::lazy_static! {
-	pub static ref EXPORTED_FIELDS: Mutex<FxHashMap<u64, Weak<Node>>> = Mutex::new(FxHashMap::default());
-}
+pub static EXPORTED_FIELDS: LazyLock<DashMap<u64, Weak<Node>>> = LazyLock::new(DashMap::new);
 
 pub trait FieldTrait: Send + Sync + 'static {
 	fn spatial_ref(&self) -> &Spatial;
@@ -271,7 +269,7 @@ impl FieldAspect for Field {
 
 	async fn export_field(node: Arc<Node>, _calling_client: Arc<Client>) -> Result<Id> {
 		let id = rand::random();
-		EXPORTED_FIELDS.lock().insert(id, Arc::downgrade(&node));
+		EXPORTED_FIELDS.insert(id, Arc::downgrade(&node));
 		Ok(id.into())
 	}
 }
@@ -370,7 +368,6 @@ impl InterfaceAspect for Interface {
 		uid: Id,
 	) -> Result<Id> {
 		let node = EXPORTED_FIELDS
-			.lock()
 			.get(&uid.0)
 			.and_then(|s| s.upgrade())
 			.map(|s| {

src/nodes/fields.rs

@@ -16,34 +16,32 @@ use crate::{
 	},
 };
 use glam::Mat4;
-use lazy_static::lazy_static;
 use mint::{ColumnMatrix4, Vector2};
 use parking_lot::Mutex;
 use stardust_xr_server_foundation::bail;
 
 use stardust_xr_wire::flex::{deserialize, serialize};
 use std::sync::Arc;
+use std::sync::LazyLock;
 
 stardust_xr_server_codegen::codegen_item_camera_protocol!();
-lazy_static! {
-	pub(super) static ref ITEM_TYPE_INFO_CAMERA: TypeInfo = TypeInfo {
-		type_name: "camera",
-		alias_info: CAMERA_ITEM_ASPECT_ALIAS_INFO.clone(),
-		ui_node_id: INTERFACE_NODE_ID,
-		ui: Default::default(),
-		items: Registry::new(),
-		acceptors: Registry::new(),
-		add_acceptor_aspect: |node| {
-			node.add_aspect(CameraItemAcceptor);
-		},
-		add_ui_aspect: |node| {
-			node.add_aspect(CameraItemUi);
-		},
-		new_acceptor_fn: |node, acceptor, acceptor_field| {
-			let _ = camera_item_ui_client::create_acceptor(node, acceptor, acceptor_field);
-		}
-	};
-}
+pub(super) static ITEM_TYPE_INFO_CAMERA: LazyLock<TypeInfo> = LazyLock::new(|| TypeInfo {
+	type_name: "camera",
+	alias_info: CAMERA_ITEM_ASPECT_ALIAS_INFO.clone(),
+	ui_node_id: INTERFACE_NODE_ID,
+	ui: Default::default(),
+	items: Registry::new(),
+	acceptors: Registry::new(),
+	add_acceptor_aspect: |node| {
+		node.add_aspect(CameraItemAcceptor);
+	},
+	add_ui_aspect: |node| {
+		node.add_aspect(CameraItemUi);
+	},
+	new_acceptor_fn: |node, acceptor, acceptor_field| {
+		let _ = camera_item_ui_client::create_acceptor(node, acceptor, acceptor_field);
+	},
+});
 
 struct FrameInfo {
 	proj_matrix: Mat4,

src/nodes/items/camera.rs

@@ -19,12 +19,11 @@ use crate::{
 	},
 };
 use glam::Mat4;
-use lazy_static::lazy_static;
 use mint::Vector2;
 use parking_lot::Mutex;
 use slotmap::{DefaultKey, Key, KeyData, SlotMap};
 use stardust_xr_server_foundation::bail;
-use std::sync::{Arc, Weak};
+use std::sync::{Arc, LazyLock, Weak};
 use tracing::debug;
 
 stardust_xr_server_codegen::codegen_item_panel_protocol!();
@@ -38,26 +37,25 @@ impl Default for Geometry {
 }
 impl Copy for Geometry {}
 
-lazy_static! {
-	pub static ref KEYMAPS: Mutex<SlotMap<DefaultKey, String>> = Mutex::new(SlotMap::default());
-	pub static ref ITEM_TYPE_INFO_PANEL: TypeInfo = TypeInfo {
-		type_name: "panel",
-		alias_info: PANEL_ITEM_ASPECT_ALIAS_INFO.clone(),
-		ui_node_id: INTERFACE_NODE_ID,
-		ui: Default::default(),
-		items: Registry::new(),
-		acceptors: Registry::new(),
-		add_acceptor_aspect: |node| {
-			node.add_aspect(PanelItemUi);
-		},
-		add_ui_aspect: |node| {
-			node.add_aspect(PanelItemAcceptor);
-		},
-		new_acceptor_fn: |node, acceptor, acceptor_field| {
-			let _ = panel_item_ui_client::create_acceptor(node, acceptor, acceptor_field);
-		}
-	};
-}
+pub static KEYMAPS: LazyLock<Mutex<SlotMap<DefaultKey, String>>> =
+	LazyLock::new(|| Mutex::new(SlotMap::default()));
+pub static ITEM_TYPE_INFO_PANEL: LazyLock<TypeInfo> = LazyLock::new(|| TypeInfo {
+	type_name: "panel",
+	alias_info: PANEL_ITEM_ASPECT_ALIAS_INFO.clone(),
+	ui_node_id: INTERFACE_NODE_ID,
+	ui: Default::default(),
+	items: Registry::new(),
+	acceptors: Registry::new(),
+	add_acceptor_aspect: |node| {
+		node.add_aspect(PanelItemUi);
+	},
+	add_ui_aspect: |node| {
+		node.add_aspect(PanelItemAcceptor);
+	},
+	new_acceptor_fn: |node, acceptor, acceptor_field| {
+		let _ = panel_item_ui_client::create_acceptor(node, acceptor, acceptor_field);
+	},
+});
 
 pub trait Backend: Send + Sync + 'static {
 	fn start_data(&self) -> Result<PanelItemInitData>;

src/nodes/items/panel.rs

@@ -11,15 +11,15 @@ use bevy::prelude::Transform as BevyTransform;
 use bevy::prelude::*;
 use bevy::render::primitives::Aabb;
 use color_eyre::eyre::OptionExt;
+use dashmap::DashMap;
 use glam::{Mat4, Quat, Vec3};
 use mint::Vector3;
 use parking_lot::{Mutex, RwLock};
-use rustc_hash::FxHashMap;
 use stardust_xr_server_foundation::bail;
 use std::fmt::Debug;
 use std::pin::Pin;
 use std::sync::atomic::Ordering;
-use std::sync::{Arc, OnceLock, Weak};
+use std::sync::{Arc, LazyLock, OnceLock, Weak};
 use std::{f32, ptr};
 
 pub struct SpatialNodePlugin;
@@ -107,9 +107,9 @@ impl Transform {
 		Mat4::from_scale_rotation_translation(scale.into(), rotation.into(), position.into())
 	}
 }
-lazy_static::lazy_static! {
-	pub static ref EXPORTED_SPATIALS: Mutex<FxHashMap<u64, Weak<Node>>> = Mutex::new(FxHashMap::default());
-}
+
+// uses dashmap because it's concurrent and doesn't use fxhash because exported
+pub static EXPORTED_SPATIALS: LazyLock<DashMap<u64, Weak<Node>>> = LazyLock::new(DashMap::new);
 
 pub struct Spatial {
 	pub node: Weak<Node>,
@@ -386,7 +386,7 @@ impl SpatialAspect for Spatial {
 	// legit gotta find a way to remove old ones, this just keeps the node alive
 	async fn export_spatial(node: Arc<Node>, _calling_client: Arc<Client>) -> Result<Id> {
 		let id = rand::random();
-		EXPORTED_SPATIALS.lock().insert(id, Arc::downgrade(&node));
+		EXPORTED_SPATIALS.insert(id, Arc::downgrade(&node));
 		Ok(id.into())
 	}
 }
@@ -494,7 +494,6 @@ impl InterfaceAspect for Interface {
 		uid: Id,
 	) -> Result<Id> {
 		let node = EXPORTED_SPATIALS
-			.lock()
 			.get(&uid.0)
 			.and_then(|s| s.upgrade())
 			.map(|s| {

src/nodes/spatial.rs

@@ -401,7 +401,7 @@ impl MousePointer {
 						.await
 						.ok()?
 						.ok()?;
-					let field_node = EXPORTED_FIELDS.lock().get(&uid)?.upgrade()?;
+					let field_node = EXPORTED_FIELDS.get(&uid)?.upgrade()?;
 					let field = field_node.get_aspect::<Field>();
 					Some((field, keyboard_proxy))
 				}
@@ -410,7 +410,7 @@ impl MousePointer {
 						.await
 						.ok()?
 						.ok()?;
-					let field_node = EXPORTED_FIELDS.lock().get(&uid)?.upgrade()?;
+					let field_node = EXPORTED_FIELDS.get(&uid)?.upgrade()?;
 					let field = field_node.get_aspect::<Field>();
 					Some((field, keyboard_proxy))
 				}