aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Lilleengen <[email protected]>2021-12-16 11:34:20 +0100
committerUlf Lilleengen <[email protected]>2021-12-16 11:34:20 +0100
commit985c11fad5d666485b809b846d294a1a2492b370 (patch)
tree405286aaad29c591aa95073655e39aed498dd1bb
parent5df16c6793a3730535ac91af8133ff744d76fad5 (diff)
Update rust-toolchain
-rw-r--r--embassy-lora/Cargo.toml4
-rw-r--r--embassy-macros/src/lib.rs1
-rw-r--r--embassy-nrf/src/lib.rs1
-rw-r--r--embassy-rp/src/lib.rs1
-rw-r--r--embassy-stm32/src/lib.rs1
-rw-r--r--examples/rp/src/bin/blinky.rs1
-rw-r--r--examples/rp/src/bin/button.rs1
-rw-r--r--examples/rp/src/bin/spi.rs1
-rw-r--r--examples/rp/src/bin/spi_display.rs1
-rw-r--r--examples/rp/src/bin/uart.rs1
-rw-r--r--examples/stm32l0/Cargo.toml4
-rw-r--r--examples/stm32wl55/Cargo.toml4
-rw-r--r--rust-toolchain.toml2
13 files changed, 8 insertions, 15 deletions
diff --git a/embassy-lora/Cargo.toml b/embassy-lora/Cargo.toml
index 024eb6aaf..9f04adabb 100644
--- a/embassy-lora/Cargo.toml
+++ b/embassy-lora/Cargo.toml
@@ -23,5 +23,5 @@ futures = { version = "0.3.17", default-features = false, features = [ "async-aw
23embedded-hal = { version = "0.2", features = ["unproven"] } 23embedded-hal = { version = "0.2", features = ["unproven"] }
24bit_field = { version = "0.10" } 24bit_field = { version = "0.10" }
25 25
26lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["async"] } 26lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] }
27lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false } 27lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false }
diff --git a/embassy-macros/src/lib.rs b/embassy-macros/src/lib.rs
index bcd3f2ad7..cdbc25179 100644
--- a/embassy-macros/src/lib.rs
+++ b/embassy-macros/src/lib.rs
@@ -288,6 +288,7 @@ struct MainArgs {
288 #[darling(default)] 288 #[darling(default)]
289 embassy_prefix: ModulePrefix, 289 embassy_prefix: ModulePrefix,
290 290
291 #[allow(unused)]
291 #[darling(default)] 292 #[darling(default)]
292 config: Option<syn::LitStr>, 293 config: Option<syn::LitStr>,
293} 294}
diff --git a/embassy-nrf/src/lib.rs b/embassy-nrf/src/lib.rs
index 5a73b87e0..b8adab473 100644
--- a/embassy-nrf/src/lib.rs
+++ b/embassy-nrf/src/lib.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![feature(generic_associated_types)] 2#![feature(generic_associated_types)]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[cfg(not(any( 5#[cfg(not(any(
diff --git a/embassy-rp/src/lib.rs b/embassy-rp/src/lib.rs
index b98d181b5..cf5c10c1a 100644
--- a/embassy-rp/src/lib.rs
+++ b/embassy-rp/src/lib.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![feature(generic_associated_types)] 2#![feature(generic_associated_types)]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[cfg(feature = "unstable-pac")] 5#[cfg(feature = "unstable-pac")]
diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs
index 425516a3f..c8a0e1705 100644
--- a/embassy-stm32/src/lib.rs
+++ b/embassy-stm32/src/lib.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![feature(generic_associated_types)] 2#![feature(generic_associated_types)]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[cfg(feature = "unstable-pac")] 5#[cfg(feature = "unstable-pac")]
diff --git a/examples/rp/src/bin/blinky.rs b/examples/rp/src/bin/blinky.rs
index d3e066e00..96e45f697 100644
--- a/examples/rp/src/bin/blinky.rs
+++ b/examples/rp/src/bin/blinky.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![no_main] 2#![no_main]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[path = "../example_common.rs"] 5#[path = "../example_common.rs"]
diff --git a/examples/rp/src/bin/button.rs b/examples/rp/src/bin/button.rs
index a7846cbf3..6492367e5 100644
--- a/examples/rp/src/bin/button.rs
+++ b/examples/rp/src/bin/button.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![no_main] 2#![no_main]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[path = "../example_common.rs"] 5#[path = "../example_common.rs"]
diff --git a/examples/rp/src/bin/spi.rs b/examples/rp/src/bin/spi.rs
index 0e59c457e..c4748f2ec 100644
--- a/examples/rp/src/bin/spi.rs
+++ b/examples/rp/src/bin/spi.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![no_main] 2#![no_main]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[path = "../example_common.rs"] 5#[path = "../example_common.rs"]
diff --git a/examples/rp/src/bin/spi_display.rs b/examples/rp/src/bin/spi_display.rs
index 702133307..1ae3ae66e 100644
--- a/examples/rp/src/bin/spi_display.rs
+++ b/examples/rp/src/bin/spi_display.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![no_main] 2#![no_main]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[path = "../example_common.rs"] 5#[path = "../example_common.rs"]
diff --git a/examples/rp/src/bin/uart.rs b/examples/rp/src/bin/uart.rs
index 379ab2438..8354f9f82 100644
--- a/examples/rp/src/bin/uart.rs
+++ b/examples/rp/src/bin/uart.rs
@@ -1,6 +1,5 @@
1#![no_std] 1#![no_std]
2#![no_main] 2#![no_main]
3#![feature(asm)]
4#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
5 4
6#[path = "../example_common.rs"] 5#[path = "../example_common.rs"]
diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml
index 53ba6ba39..ed977db8d 100644
--- a/examples/stm32l0/Cargo.toml
+++ b/examples/stm32l0/Cargo.toml
@@ -12,8 +12,8 @@ embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["
12 12
13embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["sx127x", "time", "defmt"] } 13embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["sx127x", "time", "defmt"] }
14 14
15lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["async"] } 15lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] }
16lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["default-crypto"] } 16lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["default-crypto"] }
17 17
18defmt = "0.3" 18defmt = "0.3"
19defmt-rtt = "0.3" 19defmt-rtt = "0.3"
diff --git a/examples/stm32wl55/Cargo.toml b/examples/stm32wl55/Cargo.toml
index c7344152d..504c1070c 100644
--- a/examples/stm32wl55/Cargo.toml
+++ b/examples/stm32wl55/Cargo.toml
@@ -11,8 +11,8 @@ embassy-traits = { version = "0.1.0", path = "../../embassy-traits", features =
11embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32wl55jc-cm4", "time-driver-tim2", "memory-x", "subghz", "unstable-pac"] } 11embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32wl55jc-cm4", "time-driver-tim2", "memory-x", "subghz", "unstable-pac"] }
12embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time"] } 12embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time"] }
13 13
14lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["async"] } 14lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] }
15lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["default-crypto"] } 15lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["default-crypto"] }
16 16
17defmt = "0.3" 17defmt = "0.3"
18defmt-rtt = "0.3" 18defmt-rtt = "0.3"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index d45871808..28bf12932 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,6 +1,6 @@
1# Before upgrading check that everything is available on all tier1 targets here: 1# Before upgrading check that everything is available on all tier1 targets here:
2# https://rust-lang.github.io/rustup-components-history 2# https://rust-lang.github.io/rustup-components-history
3[toolchain] 3[toolchain]
4channel = "nightly-2021-10-16" 4channel = "nightly-2021-12-16"
5components = [ "rust-src", "rustfmt" ] 5components = [ "rust-src", "rustfmt" ]
6targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ] 6targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ]