From ef36da3451f876228168419427343dc8238d714f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Mon, 16 Sep 2024 21:26:20 -0300 Subject: [PATCH] src: avoid cloning --- src/device/manager/continuous_mode.rs | 4 +--- src/server/protocols/v1/websocket.rs | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/device/manager/continuous_mode.rs b/src/device/manager/continuous_mode.rs index a6041aa..ac99296 100644 --- a/src/device/manager/continuous_mode.rs +++ b/src/device/manager/continuous_mode.rs @@ -18,7 +18,7 @@ impl DeviceManager { device_type: DeviceSelection, ) -> Option> { let raw_handler = match self.get_device_handler(device_id).await { - Ok(handler) => handler.clone(), + Ok(handler) => handler, Err(err) => { trace!("Error during start_continuous_mode: Failed to get device handler: {err:?}"); return None; @@ -49,8 +49,6 @@ impl DeviceManager { })), DeviceSelection::Ping360 => { Some(tokio::spawn(async move { - let handler = handler.clone(); - // Attempt to send the Ping360 request and handle the result let device_data = match handler .send(crate::device::devices::PingRequest::Ping360( diff --git a/src/server/protocols/v1/websocket.rs b/src/server/protocols/v1/websocket.rs index da7fae5..f4774b6 100644 --- a/src/server/protocols/v1/websocket.rs +++ b/src/server/protocols/v1/websocket.rs @@ -188,11 +188,13 @@ pub async fn websocket( stream: web::Payload, manager_handler: web::Data, ) -> Result { - let filter = match query.clone().into_inner().filter { - Some(filter) => filter.clone(), + let query_inner = query.into_inner(); + + let filter = match query_inner.filter { + Some(filter) => filter, _ => ".*".to_owned(), }; - let device_number = query.into_inner().device_number; + let device_number = query_inner.device_number; if let Some(device_number) = device_number { let request = crate::device::manager::Request::Info(crate::device::manager::UuidWrapper {