Skip to content

Commit

Permalink
Pull Embassy crates from crates.io 🎉
Browse files Browse the repository at this point in the history
Embassy published their crates to crates.io so we no longer need to add
them as git dependencies. This should remove the previously-encountered
pain of breaking API changes suddenly breaking things.

Also remove the `async_fn_in_trait` nightly feature flag now that it's
on stable.
  • Loading branch information
kesyog committed Jan 23, 2024
1 parent 701532d commit ee6f05c
Show file tree
Hide file tree
Showing 10 changed files with 223 additions and 178 deletions.
375 changes: 214 additions & 161 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ crc = "3"
critical-section = "1"
defmt = { version = "0.3" }
defmt-rtt = { version = "0.4" }
embassy-executor = { git = "https://github.com/embassy-rs/embassy", features = ["arch-cortex-m", "defmt", "nightly", "executor-thread"] }
embassy-futures = { git = "https://github.com/embassy-rs/embassy", features = ["defmt"] }
embassy-nrf = { git = "https://github.com/embassy-rs/embassy", features = ["nightly", "unstable-pac", "time-driver-rtc1", "gpiote", "defmt"] }
embassy-sync = { git = "https://github.com/embassy-rs/embassy", features = ["nightly", "defmt"] }
embassy-time = { git = "https://github.com/embassy-rs/embassy", features = ["nightly", "generic-queue-8", "defmt"] }
embassy-usb = { git = "https://github.com/embassy-rs/embassy", features = ["defmt"], optional = true}
embassy-executor = { version = "0.5", features = ["arch-cortex-m", "defmt", "executor-thread"] }
embassy-futures = { version = "0.1", features = ["defmt"] }
embassy-nrf = { version = "0.1", features = ["unstable-pac", "time-driver-rtc1", "gpiote", "defmt"] }
embassy-sync = { version = "0.5", features = ["defmt"] }
embassy-time = { version = "0.3", features = ["generic-queue-8", "defmt"] }
embassy-usb = { version = "0.1", features = ["defmt"], optional = true}
embedded-alloc = "0.5"
embedded-storage = "0.3"
embedded-storage-async = "0.4"
hex = { version = "0.4", default-features = false }
median = { version = "0.3", default-features = false }
nrf-softdevice = { git = "https://github.com/embassy-rs/nrf-softdevice", features = ["s113", "ble-gatt-server", "ble-peripheral", "critical-section-impl", "defmt", "nightly"] }
nrf52832-hal = { version = "0.16.0", default-features = false, optional = true }
nrf52840-hal = { version = "0.16.0", default-features = false, optional = true }
nrf-softdevice = { version = "0.1", features = ["s113", "ble-gatt-server", "ble-peripheral", "critical-section-impl", "defmt"] }
nrf52832-hal = { version = "0.16", default-features = false, optional = true }
nrf52840-hal = { version = "0.16", default-features = false, optional = true }
num = { version = "0.4", default-features = false }
once_cell = { version = "1.18", default-features = false, features = ["critical-section"] }
panic-probe = { version = "0.3", features = ["print-defmt"] }
Expand Down
1 change: 0 additions & 1 deletion src/bin/blinky_p0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![no_main]
#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

#[cfg(not(feature = "nrf52840"))]
Expand Down
1 change: 0 additions & 1 deletion src/bin/blinky_p1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![no_main]
#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

#[cfg(not(feature = "nrf52832"))]
Expand Down
1 change: 0 additions & 1 deletion src/bin/calibration_p0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![no_main]
#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

#[cfg(not(feature = "nrf52840"))]
Expand Down
1 change: 0 additions & 1 deletion src/bin/calibration_p1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![no_main]
#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

#[cfg(not(feature = "nrf52832"))]
Expand Down
1 change: 0 additions & 1 deletion src/bin/dongle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![no_main]
#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

#[cfg(not(feature = "nrf52840"))]
Expand Down
1 change: 0 additions & 1 deletion src/bin/proto0_0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![no_main]
#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

#[cfg(not(feature = "nrf52840"))]
Expand Down
1 change: 0 additions & 1 deletion src/bin/proto1_0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![no_main]
#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

#[cfg(not(feature = "nrf52832"))]
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

#![cfg_attr(not(test), no_std)]
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait)]
#![forbid(unsafe_op_in_unsafe_fn)]

pub mod battery_voltage;
Expand Down

0 comments on commit ee6f05c

Please sign in to comment.