From 7fbf92daf07e8839f587920c3ccf1f010eb6238e Mon Sep 17 00:00:00 2001 From: Nova Date: Sat, 11 Jun 2022 14:39:26 -0400 Subject: [PATCH] refactor(spatial): remove explicit lifetime specifier --- src/nodes/core.rs | 2 +- src/nodes/spatial.rs | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/nodes/core.rs b/src/nodes/core.rs index dd3abfc..660031b 100644 --- a/src/nodes/core.rs +++ b/src/nodes/core.rs @@ -15,7 +15,7 @@ pub struct Node<'a> { local_methods: HashMap, destroyable: bool, - pub spatial: Option>>, + pub spatial: Option>, } impl<'a> Node<'a> { diff --git a/src/nodes/spatial.rs b/src/nodes/spatial.rs index 0a8f00e..bcd03c5 100644 --- a/src/nodes/spatial.rs +++ b/src/nodes/spatial.rs @@ -9,18 +9,14 @@ use rccell::RcCell; use std::cell::{Cell, RefCell}; use std::rc::Rc; -pub struct Spatial<'a> { +pub struct Spatial { // node: WeakCell>, - parent: RefCell>>>, + parent: RefCell>>, transform: Cell, } -impl<'a> Spatial<'a> { - pub fn add_to( - node: RcCell>, - parent: Option>>, - transform: Mat4, - ) -> Result<()> { +impl Spatial { + pub fn add_to(node: RcCell, parent: Option>, transform: Mat4) -> Result<()> { if node.borrow_mut().spatial.is_none() { bail!("Node already has a Spatial aspect!"); }