diff --git a/atat/Cargo.toml b/atat/Cargo.toml index 99468ce..7add0d7 100644 --- a/atat/Cargo.toml +++ b/atat/Cargo.toml @@ -18,16 +18,16 @@ maintenance = { status = "actively-developed" } name = "atat" [dependencies] -embedded-io = "0.6.0" -embedded-io-async = "0.6.0" +embedded-io = "0.6" +embedded-io-async = "0.6" futures = { version = "0.3", default-features = false } embassy-sync = "0.6" -embassy-time = "0.3" +embassy-time = "0.4" heapless = { version = "^0.8", features = ["serde"] } serde_at = { path = "../serde_at", version = "^0.23.0", optional = true } atat_derive = { path = "../atat_derive", version = "^0.23.0", optional = true } serde_bytes = { version = "0.11.14", default-features = false, optional = true } -heapless-bytes = { version = "0.3.0", optional = true } +heapless-bytes = { version = "0.4.0", optional = true } nom = { version = "^7.1", default-features = false } @@ -36,7 +36,7 @@ log = { version = "^0.4", default-features = false, optional = true } defmt = { version = "^0.3", optional = true } [dev-dependencies] -embassy-time = { version = "0.3", features = ["std", "generic-queue"] } +embassy-time = { version = "0.4", features = ["std"] } critical-section = { version = "1.1", features = ["std"] } serde_at = { path = "../serde_at", version = "^0.23.0", features = [ "heapless", diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 8ab3bc9..215e5e8 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -30,20 +30,20 @@ cortex-m = { version = "0.7.6", optional = true } cortex-m-rt = { version = "0.7.3", optional = true } defmt-rtt = { version = "0.4", optional = true } panic-probe = { version = "0.3.0", features = ["print-defmt"], optional = true } -embassy-executor = { version = "0.5", features = [ +embassy-executor = { version = "0.7", features = [ "defmt", "arch-cortex-m", "executor-thread", - "integrated-timers", ], optional = true } -embassy-time = "0.3" -embassy-rp = { version = "0.1", features = [ +embassy-time = { version = "0.4" } +embassy-rp = { version = "0.3", features = [ + "rp2040", "unstable-pac", "time-driver", "critical-section-impl", ], optional = true } -env_logger = { version = "0.10", optional = true } +env_logger = { version = "0.11", optional = true } tokio = { version = "1.26", default-features = false, features = [ "time", "rt-multi-thread", @@ -70,8 +70,8 @@ std = [ "dep:tokio", "dep:tokio-serial", "atat/log", + "embassy-time/generic-queue-8", "embassy-time/std", - "embassy-time/generic-queue", "critical-section/std", "embedded-io-adapters", "embedded-io-adapters/tokio-1", diff --git a/examples/src/bin/embassy.rs b/examples/src/bin/embassy.rs index 0047b85..48c2ed6 100644 --- a/examples/src/bin/embassy.rs +++ b/examples/src/bin/embassy.rs @@ -41,7 +41,7 @@ async fn main(spawner: Spawner) { RX_BUF.init([0; 16]), uart::Config::default(), ); - let (reader, writer) = uart.split(); + let (writer, reader) = uart.split(); static RES_SLOT: ResponseSlot = ResponseSlot::new(); static URC_CHANNEL: UrcChannel = UrcChannel::new(); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 93bca0b..a6f6fd4 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.79" +channel = "1.83" components = ["clippy"] diff --git a/serde_at/src/de/mod.rs b/serde_at/src/de/mod.rs index 8cba13c..2f84934 100644 --- a/serde_at/src/de/mod.rs +++ b/serde_at/src/de/mod.rs @@ -66,16 +66,16 @@ pub enum Error { CustomErrorWithMessage(heapless::String<128>), } -pub(crate) struct Deserializer<'b> { - slice: &'b [u8], +pub(crate) struct Deserializer<'a> { + slice: &'a [u8], index: usize, struct_size_hint: Option, is_trailing_parsing: bool, } impl<'a> Deserializer<'a> { - const fn new(slice: &'a [u8]) -> Deserializer<'_> { - Deserializer { + const fn new(slice: &'a [u8]) -> Self { + Self { slice, index: 0, struct_size_hint: None,