From a040fef484227697a7b3bfa45f990a84d2c47c61 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Sat, 26 Aug 2023 18:04:30 +0200 Subject: [PATCH] Updated embedded-io --- Cargo.toml | 8 ++++---- src/client/client.rs | 2 +- src/client/raw_client.rs | 3 +-- src/network/mod.rs | 2 +- src/utils/buffer_writer.rs | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9c8f98c..c78b532 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,15 +15,15 @@ heapless = "0.7.10" rand_core = "0.6.0" defmt = { version = "0.3", optional = true } log = { version = "0.4.14", optional = true } -embedded-io = { version = "0.4.0", features = ["async"]} +embedded-io-async = "0.5" [dev-dependencies] tokio = { version = "1", features = ["full"] } -embedded-io = { version = "0.4.0", features = ["tokio"]} -tokio-test = { version = "0.4.2"} +embedded-io = { version = "0.4.0", features = ["tokio"] } +tokio-test = { version = "0.4.2" } env_logger = "0.9.0" futures = { version = "0.3.21" } -log = { version = "0.4.14"} +log = { version = "0.4.14" } serial_test = "0.6.0" [features] diff --git a/src/client/client.rs b/src/client/client.rs index 3a1e7cc..768bc39 100644 --- a/src/client/client.rs +++ b/src/client/client.rs @@ -22,7 +22,7 @@ * SOFTWARE. */ -use embedded_io::asynch::{Read, Write}; +use embedded_io_async::{Read, Write}; use heapless::Vec; use rand_core::RngCore; diff --git a/src/client/raw_client.rs b/src/client/raw_client.rs index 2e8bccf..e889a1e 100644 --- a/src/client/raw_client.rs +++ b/src/client/raw_client.rs @@ -1,9 +1,8 @@ -use embedded_io::asynch::{Read, Write}; +use embedded_io_async::{Read, Write}; use heapless::Vec; use rand_core::RngCore; use crate::{ - encoding::variable_byte_integer::{VariableByteInteger, VariableByteIntegerDecoder}, network::NetworkConnection, packet::v5::{ connack_packet::ConnackPacket, diff --git a/src/network/mod.rs b/src/network/mod.rs index fafa87d..0b10a10 100644 --- a/src/network/mod.rs +++ b/src/network/mod.rs @@ -23,7 +23,7 @@ */ use crate::packet::v5::reason_codes::ReasonCode; -use embedded_io::asynch::{Read, Write}; +use embedded_io_async::{Read, Write}; pub struct NetworkConnection where diff --git a/src/utils/buffer_writer.rs b/src/utils/buffer_writer.rs index 18526f1..36e4b5e 100644 --- a/src/utils/buffer_writer.rs +++ b/src/utils/buffer_writer.rs @@ -90,7 +90,7 @@ impl<'a> BuffWriter<'a> { if self.position + len > self.len { return Err(BufferError::InsufficientBufferSize); } - self.buffer[self.position..self.position+len].copy_from_slice(&array[0..len]); + self.buffer[self.position..self.position + len].copy_from_slice(&array[0..len]); self.increment_position(len); Ok(()) } @@ -183,7 +183,7 @@ impl<'a> BuffWriter<'a> { pub fn write_topic_filters_ref( &mut self, sub: bool, - len: usize, + _len: usize, filters: &Vec, MAX>, ) -> Result<(), BufferError> { for filter in filters {