From 03325ea81be84a0472fe66d743afb064eed6b904 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Mon, 4 Dec 2023 13:47:21 +0100 Subject: [PATCH] update embedded-storage{,-async}, remove patch. --- .cargo/config.toml | 3 --- embassy-boot/boot/Cargo.toml | 4 ++-- embassy-boot/nrf/Cargo.toml | 4 ++-- embassy-boot/rp/Cargo.toml | 4 ++-- embassy-boot/stm32/Cargo.toml | 4 ++-- embassy-embedded-hal/Cargo.toml | 4 ++-- embassy-nrf/Cargo.toml | 2 +- embassy-rp/Cargo.toml | 2 +- embassy-stm32/Cargo.toml | 4 ++-- examples/boot/application/rp/Cargo.toml | 2 +- examples/boot/application/stm32f7/Cargo.toml | 2 +- examples/boot/application/stm32h7/Cargo.toml | 2 +- examples/boot/bootloader/rp/Cargo.toml | 2 +- examples/boot/bootloader/stm32/Cargo.toml | 2 +- examples/nrf52840/Cargo.toml | 2 +- examples/nrf5340/Cargo.toml | 2 +- examples/stm32f3/Cargo.toml | 2 +- examples/stm32f334/Cargo.toml | 2 +- examples/stm32f4/Cargo.toml | 2 +- examples/stm32f7/Cargo.toml | 2 +- examples/stm32h5/Cargo.toml | 2 +- examples/stm32h7/Cargo.toml | 2 +- examples/stm32l0/Cargo.toml | 2 +- examples/stm32l1/Cargo.toml | 2 +- examples/stm32wl/Cargo.toml | 2 +- 25 files changed, 30 insertions(+), 33 deletions(-) delete mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index c1ab9a9b..00000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,3 +0,0 @@ -[patch.crates-io] -embedded-storage = { git = "https://github.com/rust-embedded-community/embedded-storage", rev = "634302740f8d676538c3890748e7d7dfe372a040" } -embedded-storage-async = { git = "https://github.com/rust-embedded-community/embedded-storage", rev = "634302740f8d676538c3890748e7d7dfe372a040" } \ No newline at end of file diff --git a/embassy-boot/boot/Cargo.toml b/embassy-boot/boot/Cargo.toml index ee69bc26..ee1dacc2 100644 --- a/embassy-boot/boot/Cargo.toml +++ b/embassy-boot/boot/Cargo.toml @@ -29,8 +29,8 @@ log = { version = "0.4", optional = true } ed25519-dalek = { version = "1.0.1", default_features = false, features = ["u32_backend"], optional = true } embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } -embedded-storage = "0.3.0" -embedded-storage-async = { version = "0.4.0" } +embedded-storage = "0.3.1" +embedded-storage-async = { version = "0.4.1" } salty = { git = "https://github.com/ycrypto/salty.git", rev = "a9f17911a5024698406b75c0fac56ab5ccf6a8c7", optional = true } signature = { version = "1.6.4", default-features = false } diff --git a/embassy-boot/nrf/Cargo.toml b/embassy-boot/nrf/Cargo.toml index b1650631..e4ec175a 100644 --- a/embassy-boot/nrf/Cargo.toml +++ b/embassy-boot/nrf/Cargo.toml @@ -21,8 +21,8 @@ embassy-nrf = { path = "../../embassy-nrf" } embassy-boot = { path = "../boot", default-features = false } cortex-m = { version = "0.7.6" } cortex-m-rt = { version = "0.7" } -embedded-storage = "0.3.0" -embedded-storage-async = { version = "0.4.0" } +embedded-storage = "0.3.1" +embedded-storage-async = { version = "0.4.1" } cfg-if = "1.0.0" nrf-softdevice-mbr = { version = "0.1.0", git = "https://github.com/embassy-rs/nrf-softdevice.git", branch = "master", optional = true } diff --git a/embassy-boot/rp/Cargo.toml b/embassy-boot/rp/Cargo.toml index 7329ea57..ad385473 100644 --- a/embassy-boot/rp/Cargo.toml +++ b/embassy-boot/rp/Cargo.toml @@ -24,8 +24,8 @@ embassy-time = { path = "../../embassy-time" } cortex-m = { version = "0.7.6" } cortex-m-rt = { version = "0.7" } -embedded-storage = "0.3.0" -embedded-storage-async = { version = "0.4.0" } +embedded-storage = "0.3.1" +embedded-storage-async = { version = "0.4.1" } cfg-if = "1.0.0" [features] diff --git a/embassy-boot/stm32/Cargo.toml b/embassy-boot/stm32/Cargo.toml index a9f0e4f0..7dedf8c4 100644 --- a/embassy-boot/stm32/Cargo.toml +++ b/embassy-boot/stm32/Cargo.toml @@ -23,8 +23,8 @@ embassy-stm32 = { path = "../../embassy-stm32", default-features = false } embassy-boot = { path = "../boot", default-features = false } cortex-m = { version = "0.7.6" } cortex-m-rt = { version = "0.7" } -embedded-storage = "0.3.0" -embedded-storage-async = { version = "0.4.0" } +embedded-storage = "0.3.1" +embedded-storage-async = { version = "0.4.1" } cfg-if = "1.0.0" [features] diff --git a/embassy-embedded-hal/Cargo.toml b/embassy-embedded-hal/Cargo.toml index db4dc958..7cd796e8 100644 --- a/embassy-embedded-hal/Cargo.toml +++ b/embassy-embedded-hal/Cargo.toml @@ -25,8 +25,8 @@ embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ ] } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.2" } -embedded-storage = "0.3.0" -embedded-storage-async = { version = "0.4.0" } +embedded-storage = "0.3.1" +embedded-storage-async = { version = "0.4.1" } nb = "1.0.0" defmt = { version = "0.3", optional = true } diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index bde15267..2da81a0f 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml @@ -106,7 +106,7 @@ cortex-m = "0.7.6" critical-section = "1.1" rand_core = "0.6.3" fixed = "1.10.0" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" embedded-storage-async = "0.4.0" cfg-if = "1.0.0" diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml index 1a2945a7..3c654975 100644 --- a/embassy-rp/Cargo.toml +++ b/embassy-rp/Cargo.toml @@ -71,7 +71,7 @@ chrono = { version = "0.4", default-features = false, optional = true } embedded-io = { version = "0.6.0" } embedded-io-async = { version = "0.6.1" } embedded-storage = { version = "0.3" } -embedded-storage-async = { version = "0.4.0" } +embedded-storage-async = { version = "0.4.1" } rand_core = "0.6.4" fixed = "1.23.1" diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 0ef60305..dc9b331c 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml @@ -46,8 +46,8 @@ embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-nb = { version = "=1.0.0-rc.2" } -embedded-storage = "0.3.0" -embedded-storage-async = { version = "0.4.0" } +embedded-storage = "0.3.1" +embedded-storage-async = { version = "0.4.1" } defmt = { version = "0.3", optional = true } log = { version = "0.4.14", optional = true } diff --git a/examples/boot/application/rp/Cargo.toml b/examples/boot/application/rp/Cargo.toml index 3008552e..54ec53b3 100644 --- a/examples/boot/application/rp/Cargo.toml +++ b/examples/boot/application/rp/Cargo.toml @@ -20,7 +20,7 @@ embedded-hal = { version = "0.2.6" } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m-rt = "0.7.0" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" [features] default = ["panic-reset"] diff --git a/examples/boot/application/stm32f7/Cargo.toml b/examples/boot/application/stm32f7/Cargo.toml index a3d345b6..57be97af 100644 --- a/examples/boot/application/stm32f7/Cargo.toml +++ b/examples/boot/application/stm32f7/Cargo.toml @@ -16,7 +16,7 @@ defmt = { version = "0.3", optional = true } defmt-rtt = { version = "0.4", optional = true } panic-reset = { version = "0.1.1" } embedded-hal = { version = "0.2.6" } -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m-rt = "0.7.0" diff --git a/examples/boot/application/stm32h7/Cargo.toml b/examples/boot/application/stm32h7/Cargo.toml index 56b95993..057060f8 100644 --- a/examples/boot/application/stm32h7/Cargo.toml +++ b/examples/boot/application/stm32h7/Cargo.toml @@ -16,7 +16,7 @@ defmt = { version = "0.3", optional = true } defmt-rtt = { version = "0.4", optional = true } panic-reset = { version = "0.1.1" } embedded-hal = { version = "0.2.6" } -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m-rt = "0.7.0" diff --git a/examples/boot/bootloader/rp/Cargo.toml b/examples/boot/bootloader/rp/Cargo.toml index 14297c7e..18693f06 100644 --- a/examples/boot/bootloader/rp/Cargo.toml +++ b/examples/boot/bootloader/rp/Cargo.toml @@ -16,7 +16,7 @@ embassy-time = { path = "../../../../embassy-time", features = [] } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m-rt = { version = "0.7" } -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" embedded-storage-async = "0.4.0" cfg-if = "1.0.0" diff --git a/examples/boot/bootloader/stm32/Cargo.toml b/examples/boot/bootloader/stm32/Cargo.toml index fb38c3a6..aa2b9fbe 100644 --- a/examples/boot/bootloader/stm32/Cargo.toml +++ b/examples/boot/bootloader/stm32/Cargo.toml @@ -14,7 +14,7 @@ embassy-boot-stm32 = { path = "../../../../embassy-boot/stm32" } cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } cortex-m-rt = { version = "0.7" } -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" embedded-storage-async = "0.4.0" cfg-if = "1.0.0" diff --git a/examples/nrf52840/Cargo.toml b/examples/nrf52840/Cargo.toml index e2e79eae..be521922 100644 --- a/examples/nrf52840/Cargo.toml +++ b/examples/nrf52840/Cargo.toml @@ -33,7 +33,7 @@ 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" +embedded-storage = "0.3.1" usbd-hid = "0.6.0" serde = { version = "1.0.136", default-features = false } embedded-hal = { version = "1.0.0-rc.2" } diff --git a/examples/nrf5340/Cargo.toml b/examples/nrf5340/Cargo.toml index b4d71c75..d14678ab 100644 --- a/examples/nrf5340/Cargo.toml +++ b/examples/nrf5340/Cargo.toml @@ -23,7 +23,7 @@ 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" +embedded-storage = "0.3.1" usbd-hid = "0.6.0" serde = { version = "1.0.136", default-features = false } diff --git a/examples/stm32f3/Cargo.toml b/examples/stm32f3/Cargo.toml index ad6b8ef4..fe852387 100644 --- a/examples/stm32f3/Cargo.toml +++ b/examples/stm32f3/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.8", default-features = false } nb = "1.0.0" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" static_cell = { version = "2", features = ["nightly"]} [profile.release] diff --git a/examples/stm32f334/Cargo.toml b/examples/stm32f334/Cargo.toml index 5cdcabfb..ad9060a2 100644 --- a/examples/stm32f334/Cargo.toml +++ b/examples/stm32f334/Cargo.toml @@ -22,5 +22,5 @@ panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } heapless = { version = "0.8", default-features = false } nb = "1.0.0" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" static_cell = { version = "2", features = ["nightly"]} diff --git a/examples/stm32f4/Cargo.toml b/examples/stm32f4/Cargo.toml index 1e85371e..947805c4 100644 --- a/examples/stm32f4/Cargo.toml +++ b/examples/stm32f4/Cargo.toml @@ -25,7 +25,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } heapless = { version = "0.8", default-features = false } nb = "1.0.0" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" micromath = "2.0.0" static_cell = { version = "2", features = ["nightly"]} chrono = { version = "^0.4", default-features = false} diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml index e029da2c..2e1f27df 100644 --- a/examples/stm32f7/Cargo.toml +++ b/examples/stm32f7/Cargo.toml @@ -26,7 +26,7 @@ heapless = { version = "0.8", default-features = false } nb = "1.0.0" rand_core = "0.6.3" critical-section = "1.1" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" static_cell = { version = "2", features = ["nightly"]} [profile.release] diff --git a/examples/stm32h5/Cargo.toml b/examples/stm32h5/Cargo.toml index d389463f..d15ecee1 100644 --- a/examples/stm32h5/Cargo.toml +++ b/examples/stm32h5/Cargo.toml @@ -30,7 +30,7 @@ rand_core = "0.6.3" critical-section = "1.1" micromath = "2.0.0" stm32-fmc = "0.3.0" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" static_cell = { version = "2", features = ["nightly"]} # cargo build/run diff --git a/examples/stm32h7/Cargo.toml b/examples/stm32h7/Cargo.toml index 85396d8c..ea59b5c0 100644 --- a/examples/stm32h7/Cargo.toml +++ b/examples/stm32h7/Cargo.toml @@ -30,7 +30,7 @@ rand_core = "0.6.3" critical-section = "1.1" micromath = "2.0.0" stm32-fmc = "0.3.0" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" static_cell = { version = "2", features = ["nightly"]} chrono = { version = "^0.4", default-features = false } diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml index 8ce1e235..9fad48df 100644 --- a/examples/stm32l0/Cargo.toml +++ b/examples/stm32l0/Cargo.toml @@ -18,7 +18,7 @@ embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["de defmt = "0.3" defmt-rtt = "0.4" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" embedded-io = { version = "0.6.0" } embedded-io-async = { version = "0.6.1" } diff --git a/examples/stm32l1/Cargo.toml b/examples/stm32l1/Cargo.toml index 94fe339a..907b8ea6 100644 --- a/examples/stm32l1/Cargo.toml +++ b/examples/stm32l1/Cargo.toml @@ -19,7 +19,7 @@ embedded-hal = "0.2.6" panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } heapless = { version = "0.8", default-features = false } -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" [profile.release] debug = 2 diff --git a/examples/stm32wl/Cargo.toml b/examples/stm32wl/Cargo.toml index 58872135..13a16307 100644 --- a/examples/stm32wl/Cargo.toml +++ b/examples/stm32wl/Cargo.toml @@ -18,7 +18,7 @@ defmt-rtt = "0.4" cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } cortex-m-rt = "0.7.0" embedded-hal = "0.2.6" -embedded-storage = "0.3.0" +embedded-storage = "0.3.1" panic-probe = { version = "0.3", features = ["print-defmt"] } futures = { version = "0.3.17", default-features = false, features = ["async-await"] } heapless = { version = "0.8", default-features = false }