Skip to content

Commit

Permalink
chore(*): Bump embassy dependencies to newly released versions (#217)
Browse files Browse the repository at this point in the history
* Bump embassy dependencies to newly released versions

* Bump toolchain version

* Fix examples
  • Loading branch information
MathiasKoch authored Jan 12, 2025
1 parent a81487b commit c31f700
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions atat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/src/bin/embassy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<INGRESS_BUF_SIZE> = ResponseSlot::new();
static URC_CHANNEL: UrcChannel<common::Urc, URC_CAPACITY, URC_SUBSCRIBERS> = UrcChannel::new();
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.79"
channel = "1.83"
components = ["clippy"]
8 changes: 4 additions & 4 deletions serde_at/src/de/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<usize>,
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,
Expand Down

0 comments on commit c31f700

Please sign in to comment.