diff --git a/src/core/scenegraph.rs b/src/core/scenegraph.rs index 423f296..ea2ef06 100644 --- a/src/core/scenegraph.rs +++ b/src/core/scenegraph.rs @@ -1,15 +1,16 @@ use crate::core::client::Client; use crate::nodes::core::Node; use anyhow::Result; -use core::hash::BuildHasherDefault; -use dashmap::DashMap; use libstardustxr::scenegraph; use libstardustxr::scenegraph::ScenegraphError; use rccell::RcCell; -use rustc_hash::FxHasher; use std::cell::RefCell; use std::rc::{Rc, Weak}; +use core::hash::BuildHasherDefault; +use dashmap::DashMap; +use rustc_hash::FxHasher; + #[derive(Default)] pub struct Scenegraph<'a> { client: RefCell>>, diff --git a/src/nodes/core.rs b/src/nodes/core.rs index 4d782fa..e8bc8dd 100644 --- a/src/nodes/core.rs +++ b/src/nodes/core.rs @@ -8,6 +8,9 @@ use std::rc::{Rc, Weak}; use std::sync::Arc; use std::{collections::HashMap, vec::Vec}; +use core::hash::BuildHasherDefault; +use rustc_hash::FxHasher; + pub type Signal = fn(&Node, Rc, &[u8]) -> Result<()>; pub type Method = fn(&Node, Rc, &[u8]) -> Result>; @@ -15,8 +18,8 @@ pub struct Node<'a> { client: Weak>, path: String, // trailing_slash_pos: usize, - local_signals: HashMap, - local_methods: HashMap, + local_signals: HashMap>, + local_methods: HashMap>, destroyable: bool, pub spatial: Option>, @@ -46,8 +49,8 @@ impl<'a> Node<'a> { client, path, // trailing_slash_pos: parent.len(), - local_signals: HashMap::new(), - local_methods: HashMap::new(), + local_signals: Default::default(), + local_methods: Default::default(), destroyable, spatial: None,