From f84e4c7e317489954de3be92cf0fe2dfd93c15c3 Mon Sep 17 00:00:00 2001 From: Claas Date: Mon, 19 Aug 2024 13:50:51 +0200 Subject: [PATCH] Remove temporary unwrap --- fan-controller/src/mqtt/client.rs | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/fan-controller/src/mqtt/client.rs b/fan-controller/src/mqtt/client.rs index 2ef9424..b76f7e0 100644 --- a/fan-controller/src/mqtt/client.rs +++ b/fan-controller/src/mqtt/client.rs @@ -234,18 +234,15 @@ mod runner { pub(crate) async fn run(mut self) -> ! { loop { - // let result: Result<&[u8], ReceiveError> = self.read().await.map_err(ReceiveError::ReadError); - // let bytes = match result { - // Ok(bytes) => bytes, - // Err(error) => { - // self.publisher.publish(Err(error)).await; - // continue; - // } - // }; - - let read = self.tcp_receiver.read(&mut self.receive_buffer); - let bytes_read = with_timeout(self.timeout, read).await.unwrap().unwrap(); - let bytes = &self.receive_buffer[..bytes_read]; + let result: Result<&[u8], ReceiveError> = + self.read().await.map_err(ReceiveError::ReadError); + let bytes = match result { + Ok(bytes) => bytes, + Err(error) => { + self.publisher.publish(Err(error)).await; + continue; + } + }; let result = Packet::read(bytes); -- 2.51.2