refactor: pass cargo clippy as much as possible
This commit is contained in:
@@ -24,9 +24,7 @@ impl<'a> Scenegraph<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_node(&self, path: &str) -> Weak<RefCell<Node<'a>>> {
|
pub fn get_node(&self, path: &str) -> Weak<RefCell<Node<'a>>> {
|
||||||
self.nodes
|
self.nodes.get(path).map_or(Weak::default(), Rc::downgrade)
|
||||||
.get(path)
|
|
||||||
.map_or(Weak::default(), |node| Rc::downgrade(node))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
mod core;
|
mod core;
|
||||||
mod nodes;
|
mod nodes;
|
||||||
use self::core::eventloop::EventLoop;
|
use self::core::eventloop::EventLoop;
|
||||||
|
|
||||||
use ctrlc;
|
|
||||||
use std::sync::mpsc::channel;
|
use std::sync::mpsc::channel;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
|
|||||||
@@ -41,7 +41,9 @@ impl<'a> Node<'a> {
|
|||||||
}
|
}
|
||||||
let node = Node {
|
let node = Node {
|
||||||
path: path.to_string(),
|
path: path.to_string(),
|
||||||
trailing_slash_pos: path.rfind('/').ok_or(anyhow!("Invalid path {}", path))?,
|
trailing_slash_pos: path
|
||||||
|
.rfind('/')
|
||||||
|
.ok_or_else(|| anyhow!("Invalid path {}", path))?,
|
||||||
messenger: weak_messenger,
|
messenger: weak_messenger,
|
||||||
local_signals: HashMap::new(),
|
local_signals: HashMap::new(),
|
||||||
local_methods: HashMap::new(),
|
local_methods: HashMap::new(),
|
||||||
@@ -50,28 +52,29 @@ impl<'a> Node<'a> {
|
|||||||
};
|
};
|
||||||
let node_ref = Rc::new(RefCell::new(node));
|
let node_ref = Rc::new(RefCell::new(node));
|
||||||
let weak_node = Rc::downgrade(&node_ref);
|
let weak_node = Rc::downgrade(&node_ref);
|
||||||
if client.is_some() {
|
match client {
|
||||||
client.unwrap().scenegraph.add_node(node_ref);
|
Some(client_) => client_.scenegraph.add_node(node_ref),
|
||||||
}
|
None => {}
|
||||||
|
};
|
||||||
Ok(weak_node)
|
Ok(weak_node)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn send_local_signal(&self, method: &str, data: &[u8]) -> Result<()> {
|
pub fn send_local_signal(&self, method: &str, data: &[u8]) -> Result<()> {
|
||||||
self.local_signals
|
self.local_signals
|
||||||
.get(method)
|
.get(method)
|
||||||
.ok_or(anyhow!("Signal {} not found", method))?(data);
|
.ok_or_else(|| anyhow!("Signal {} not found", method))?(data);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
pub fn execute_local_method(&self, method: &str, data: &[u8]) -> Result<Vec<u8>> {
|
pub fn execute_local_method(&self, method: &str, data: &[u8]) -> Result<Vec<u8>> {
|
||||||
Ok(self
|
Ok(self
|
||||||
.local_methods
|
.local_methods
|
||||||
.get(method)
|
.get(method)
|
||||||
.ok_or(anyhow!("Method {} not found", method))?(data))
|
.ok_or_else(|| anyhow!("Method {} not found", method))?(data))
|
||||||
}
|
}
|
||||||
pub fn send_remote_signal(&self, method: &str, data: &[u8]) -> Result<()> {
|
pub fn send_remote_signal(&self, method: &str, data: &[u8]) -> Result<()> {
|
||||||
self.messenger
|
self.messenger
|
||||||
.upgrade()
|
.upgrade()
|
||||||
.ok_or(anyhow!("Invalid messenger"))?
|
.ok_or_else(|| anyhow!("Invalid messenger"))?
|
||||||
.send_remote_signal(self.path.as_str(), method, data)
|
.send_remote_signal(self.path.as_str(), method, data)
|
||||||
.map_err(|_| anyhow!("Unable to write in messenger"))
|
.map_err(|_| anyhow!("Unable to write in messenger"))
|
||||||
}
|
}
|
||||||
@@ -83,7 +86,7 @@ impl<'a> Node<'a> {
|
|||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
self.messenger
|
self.messenger
|
||||||
.upgrade()
|
.upgrade()
|
||||||
.ok_or(anyhow!("Invalid messenger"))?
|
.ok_or_else(|| anyhow!("Invalid messenger"))?
|
||||||
.execute_remote_method(self.path.as_str(), method, data, callback)
|
.execute_remote_method(self.path.as_str(), method, data, callback)
|
||||||
.map_err(|_| anyhow!("Unable to write in messenger"))
|
.map_err(|_| anyhow!("Unable to write in messenger"))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user