From 8a34286a22d5f7de5d481de62dd726ef66addb00 Mon Sep 17 00:00:00 2001 From: Nova Date: Sun, 12 Jun 2022 02:04:39 -0400 Subject: [PATCH] refactor(scenegraph): use parking_lot --- src/core/scenegraph.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/scenegraph.rs b/src/core/scenegraph.rs index 0729f1f..dfc7f30 100644 --- a/src/core/scenegraph.rs +++ b/src/core/scenegraph.rs @@ -3,11 +3,11 @@ use crate::nodes::core::Node; use anyhow::Result; use libstardustxr::scenegraph; use libstardustxr::scenegraph::ScenegraphError; +use parking_lot::RwLock; use rccell::RcCell; use std::cell::RefCell; use std::collections::HashMap; use std::rc::{Rc, Weak}; -use std::sync::RwLock; #[derive(Default)] pub struct Scenegraph<'a> { @@ -27,16 +27,16 @@ impl<'a> Scenegraph<'a> { pub fn add_node(&self, node: Node<'a>) -> RcCell> { let path = node.get_path().to_string(); let node_rc = RcCell::new(node); - self.nodes.write().unwrap().insert(path, node_rc.clone()); + self.nodes.write().insert(path, node_rc.clone()); node_rc } pub fn get_node(&self, path: &str) -> Option>> { - Some(self.nodes.read().ok()?.get(path)?.clone()) + Some(self.nodes.read().get(path)?.clone()) } pub fn remove_node(&self, path: &str) -> Option>> { - self.nodes.write().unwrap().remove(path) + self.nodes.write().remove(path) } }