diff options
author | Romeo Disca <romeo.disca@gmail.com> | 2020-08-20 10:56:53 +0200 |
---|---|---|
committer | Romeo Disca <romeo.disca@gmail.com> | 2020-08-20 10:56:53 +0200 |
commit | ffa296117d9f5820730acb83ac6d6771a61cefd8 (patch) | |
tree | 79243bfc7a00ee0651d9331a75b53ad2cbbc4797 /src | |
parent | fc00a175dda64108f4a26e4b846bf0ae9e2eabe3 (diff) |
refactor: different things
Diffstat (limited to 'src')
-rwxr-xr-x | src/client.rs | 6 | ||||
-rwxr-xr-x | src/events/stream_mapper.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client.rs b/src/client.rs index a1a63f7..82781e8 100755 --- a/src/client.rs +++ b/src/client.rs @@ -12,11 +12,11 @@ use super::events::stream_mapper::*; use super::commands::stream_mapper::CommandToByteMapper; use super::commands::Command; -type EventClosure = dyn FnMut(Event) + Sync + Send + 'static; +type EventClosure = dyn FnMut(&Event) + Sync + Send + 'static; type EventClosureMutex = Box<EventClosure>; pub fn event_handler<F>(f: F) -> EventClosureMutex - where F: FnMut(Event) + Sync + Send + 'static + where F: FnMut(&Event) + Sync + Send + 'static { Box::new(f) } @@ -72,7 +72,7 @@ impl FlicClient { EventResult::Some(event) => { let mut map = self.map.lock().await; for ref mut f in &mut *map { - f(event.clone()); + f(&event); } } _ => {} diff --git a/src/events/stream_mapper.rs b/src/events/stream_mapper.rs index 5244d58..1dc6b60 100755 --- a/src/events/stream_mapper.rs +++ b/src/events/stream_mapper.rs @@ -54,7 +54,7 @@ impl ByteToEventMapper { } - pub fn has_packet(&self) -> HasPacketResult { + fn has_packet(&self) -> HasPacketResult { match (self.fifo.get(0), self.fifo.get(1), self.fifo.get(2)) { (Some(&lower), Some(&upper), Some(&opcode)) => { let len = ((upper as usize) << 8) + (lower as usize); |