Update to critical-section 1.0, atomic-polyfill 1.0

Dirbaio · Dirbaio · commit 1ff83dc1e170 · 2022-08-12T14:54:18.000+02:00
diff --git a/embassy-cortex-m/Cargo.toml b/embassy-cortex-m/Cargo.toml
@@ -39,8 +39,8 @@ embassy-util = { version = "0.1.0", path = "../embassy-util" }
 embassy-executor = { version = "0.1.0", path = "../embassy-executor"}
 embassy-macros = { version = "0.1.0", path = "../embassy-macros"}
 embassy-hal-common = { version = "0.1.0", path = "../embassy-hal-common"}
-atomic-polyfill = "0.1.5"
-critical-section = "0.2.5"
+atomic-polyfill = "1.0.1"
+critical-section = "1.0"
 cfg-if = "1.0.0"
 cortex-m = "0.7.3"
 
diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
@@ -60,8 +60,8 @@ embedded-hal-async = { version = "0.1.0-alpha.1", optional = true}
 
 futures-util = { version = "0.3.17", default-features = false }
 embassy-macros  = { version = "0.1.0", path = "../embassy-macros"}
-atomic-polyfill = "0.1.5"
-critical-section = "0.2.5"
+atomic-polyfill = "1.0.1"
+critical-section = "1.0"
 cfg-if = "1.0.0"
 
 # WASM dependencies
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml
@@ -82,7 +82,7 @@ log = { version = "0.4.14", optional = true }
 cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.3"
 futures     = { version = "0.3.17", default-features = false }
-critical-section = "0.2.5"
+critical-section = "1.0"
 rand_core = "0.6.3"
 fixed = "1.10.0"
 embedded-storage = "0.3.0"
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml
@@ -33,12 +33,12 @@ embassy-cortex-m = { version = "0.1.0", path = "../embassy-cortex-m", features =
 embassy-hal-common = {version = "0.1.0", path = "../embassy-hal-common" }
 embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" }
 embassy-macros = { version = "0.1.0", path = "../embassy-macros", features = ["rp"]}
-atomic-polyfill = "0.1.5"
+atomic-polyfill = "1.0.1"
 defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 cortex-m-rt = ">=0.6.15,<0.8"
 cortex-m = "0.7.3"
-critical-section = "0.2.5"
+critical-section = "1.0"
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 
 rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="9ad7223a48a065e612bc7dc7be5bf5bd0b41cfc4", features = ["rt"] }
diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml
@@ -55,9 +55,8 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa
 rand_core = "0.6.3"
 sdio-host = "0.5.0"
 embedded-sdmmc = { git = "https://github.com/thalesfragoso/embedded-sdmmc-rs", branch = "async", optional = true }
-critical-section = "0.2.5"
-bare-metal = "1.0.0"
-atomic-polyfill = "0.1.5"
+critical-section = "1.0"
+atomic-polyfill = "1.0.1"
 stm32-metapac = { version = "0.1.0", path = "../stm32-metapac", features = ["rt"] }
 vcell = "0.1.3"
 bxcan = "0.7.0"
diff --git a/embassy-stm32/src/interrupt.rs b/embassy-stm32/src/interrupt.rs
@@ -1,5 +1,4 @@
-pub use bare_metal::Mutex;
-pub use critical_section::CriticalSection;
+pub use critical_section::{CriticalSection, Mutex};
 pub use embassy_cortex_m::interrupt::*;
 
 pub use crate::_generated::interrupt::*;
diff --git a/embassy-usb-hid/Cargo.toml b/embassy-usb-hid/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-usb-hid-v$VERSION/embassy-usb-hid/src/"
 src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-usb-hid/src/"
-features = ["defmt", "embassy-executor/time-tick-1mhz"]
+features = ["defmt"]
 flavors = [
     { name = "default", target = "thumbv7em-none-eabihf" },
 ]
diff --git a/embassy-util/Cargo.toml b/embassy-util/Cargo.toml
@@ -19,8 +19,8 @@ defmt = { version = "0.3", optional = true }
 log = { version = "0.4.14", optional = true }
 
 futures-util = { version = "0.3.17", default-features = false }
-atomic-polyfill = "0.1.5"
-critical-section = "0.2.5"
+atomic-polyfill = "1.0.1"
+critical-section = "1.0"
 heapless = "0.7.5"
 cfg-if = "1.0.0"
 embedded-io = "0.3.0"
diff --git a/examples/nrf/Cargo.toml b/examples/nrf/Cargo.toml
@@ -21,11 +21,17 @@ embedded-io = "0.3.0"
 defmt = "0.3"
 defmt-rtt = "0.3"
 
-cortex-m = "0.7.3"
+cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
 cortex-m-rt = "0.7.0"
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 rand = { version = "0.8.4", default-features = false }
 embedded-storage = "0.3.0"
 usbd-hid = "0.5.2"
 serde = { version = "1.0.136", default-features = false }
+
+[patch.crates-io]
+cortex-m = { git = "https://github.com/rust-embedded/cortex-m", rev = "df9a479f8a6260feb7e9fc05fa0e001f555b9340"}
+defmt-rtt = { git = "https://github.com/knurling-rs/defmt", rev = "372c0cc9951bdf596058b3396e62da6f67fb63bd"}
+defmt-macros = { git = "https://github.com/knurling-rs/defmt", rev = "372c0cc9951bdf596058b3396e62da6f67fb63bd"}
+defmt = { git = "https://github.com/knurling-rs/defmt", rev = "372c0cc9951bdf596058b3396e62da6f67fb63bd"}
diff --git a/examples/rp/Cargo.toml b/examples/rp/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
 embassy-util = { version = "0.1.0", path = "../../embassy-util", features = ["defmt"] }
 embassy-executor = { version = "0.1.0", path = "../../embassy-executor", features = ["defmt", "defmt-timestamp-uptime"] }
 embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "unstable-traits", "nightly", "unstable-pac"] }
-atomic-polyfill = "0.1.5"
+atomic-polyfill = "1.0.1"
 
 defmt = "0.3"
 defmt-rtt = "0.3"
diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml
@@ -21,5 +21,5 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa
 heapless = { version = "0.7.5", default-features = false }
 nb = "1.0.0"
 rand_core = "0.6.3"
-critical-section = "0.2.3"
+critical-section = "1.0"
 embedded-storage = "0.3.0"
diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml
@@ -23,7 +23,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] }
 futures = { version = "0.3.17", default-features = false, features = ["async-await"] }
 heapless = { version = "0.7.5", default-features = false }
 rand_core = "0.6.3"
-critical-section = "0.2.5"
+critical-section = "1.0"
 micromath = "2.0.0"
 stm32-fmc = "0.2.4"
 embedded-storage = "0.3.0"
diff --git a/examples/wasm/Cargo.toml b/examples/wasm/Cargo.toml
@@ -14,4 +14,4 @@ wasm-logger = "0.2.0"
 wasm-bindgen = "0.2"
 web-sys = { version = "0.3", features = ["Document", "Element", "HtmlElement", "Node", "Window" ] }
 log = "0.4.11"
-critical-section = "0.2.5"
+critical-section = "1.0"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ edition = "2021"`
`6`	`6`	`[package.metadata.embassy_docs]`
`7`	`7`	`src_base = "https://github.com/embassy-rs/embassy/blob/embassy-usb-hid-v$VERSION/embassy-usb-hid/src/"`
`8`	`8`	`src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-usb-hid/src/"`
`9`		`-features = ["defmt", "embassy-executor/time-tick-1mhz"]`
	`9`	`+features = ["defmt"]`
`10`	`10`	`flavors = [`
`11`	`11`	`{ name = "default", target = "thumbv7em-none-eabihf" },`
`12`	`12`	`]`