From a4fb79cff3d760fd415c8f5aaa4a11dbe81a43f8 Mon Sep 17 00:00:00 2001
From: alexmoon <alex@moonspot.org>
Date: Tue, 5 Sep 2023 11:32:25 -0600
Subject: [PATCH] Update rust-toolchain, embassy, and num-enum

---
 Cargo.toml                | 14 ++++++--------
 examples/Cargo.toml       |  2 +-
 nrf-softdevice/Cargo.toml |  2 +-
 rust-toolchain.toml       |  6 +++---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 92807d81..ff669183 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,16 +13,14 @@ members = [
     "examples",
 ]
 
-exclude = [
-    "nrf-softdevice-gen"
-]
+exclude = ["nrf-softdevice-gen"]
 
 [patch.crates-io]
-embassy-nrf = { git = "https://github.com/embassy-rs/embassy", rev = "8a811cfcf75b25fe81168134bf0cf8a8d387c391" }
-embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "8a811cfcf75b25fe81168134bf0cf8a8d387c391" }
-embassy-macros = { git = "https://github.com/embassy-rs/embassy", rev = "8a811cfcf75b25fe81168134bf0cf8a8d387c391" }
-embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "8a811cfcf75b25fe81168134bf0cf8a8d387c391" }
-embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "8a811cfcf75b25fe81168134bf0cf8a8d387c391" }
+embassy-nrf = { git = "https://github.com/embassy-rs/embassy", rev = "ce662766be80d75b5f9294ae4b792f7db252ccd3" }
+embassy-executor = { git = "https://github.com/embassy-rs/embassy", rev = "ce662766be80d75b5f9294ae4b792f7db252ccd3" }
+embassy-macros = { git = "https://github.com/embassy-rs/embassy", rev = "ce662766be80d75b5f9294ae4b792f7db252ccd3" }
+embassy-sync = { git = "https://github.com/embassy-rs/embassy", rev = "ce662766be80d75b5f9294ae4b792f7db252ccd3" }
+embassy-time = { git = "https://github.com/embassy-rs/embassy", rev = "ce662766be80d75b5f9294ae4b792f7db252ccd3" }
 
 [profile.release]
 codegen-units = 1
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index bfef9185..bd8bf3f4 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -18,7 +18,7 @@ ble-gatt-client = ["nrf-softdevice/ble-gatt-client"]
 ble-sec = ["nrf-softdevice/ble-sec"]
 
 [dependencies]
-embassy-executor = { version = "0.2.0", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "nightly", "defmt", "integrated-timers"]}
+embassy-executor = { version = "0.3.0", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "nightly", "defmt", "integrated-timers"]}
 embassy-time = { version = "0.1.0", features = ["nightly", "defmt", "defmt-timestamp-uptime"]}
 embassy-sync = { version = "0.2.0" }
 embassy-nrf = { version = "0.1.0", features = [ "nightly", "defmt", "nrf52840", "gpiote", "time-driver-rtc1" ]}
diff --git a/nrf-softdevice/Cargo.toml b/nrf-softdevice/Cargo.toml
index aef04155..f5b8b901 100644
--- a/nrf-softdevice/Cargo.toml
+++ b/nrf-softdevice/Cargo.toml
@@ -49,7 +49,7 @@ defmt = { version = "0.3", optional = true }
 log = { version = "0.4.11", optional = true }
 critical-section = { version = "1.0", optional = true }
 
-num_enum = { version = "0.6.1", default-features = false }
+num_enum = { version = "0.7.0", default-features = false }
 embassy-sync = { version = "0.2.0" }
 embassy-futures = { version = "0.1.0" }
 cortex-m = "0.7.2"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 2242e53a..78269665 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,6 +1,6 @@
 # Before upgrading check that everything is available on all tier1 targets here:
 # https://rust-lang.github.io/rustup-components-history
 [toolchain]
-channel = "nightly-2023-06-28"
-components = [ "rust-src", "rustfmt" ]
-targets = [ "thumbv7em-none-eabihf" ]
+channel = "nightly-2023-08-19"
+components = ["rust-src", "rustfmt"]
+targets = ["thumbv7em-none-eabihf"]