From 985c11fad5d666485b809b846d294a1a2492b370 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Thu, 16 Dec 2021 11:34:20 +0100 Subject: [PATCH] Update rust-toolchain --- embassy-lora/Cargo.toml | 4 ++-- embassy-macros/src/lib.rs | 1 + embassy-nrf/src/lib.rs | 1 - embassy-rp/src/lib.rs | 1 - embassy-stm32/src/lib.rs | 1 - examples/rp/src/bin/blinky.rs | 1 - examples/rp/src/bin/button.rs | 1 - examples/rp/src/bin/spi.rs | 1 - examples/rp/src/bin/spi_display.rs | 1 - examples/rp/src/bin/uart.rs | 1 - examples/stm32l0/Cargo.toml | 4 ++-- examples/stm32wl55/Cargo.toml | 4 ++-- rust-toolchain.toml | 2 +- 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 embedded-hal = { version = "0.2", features = ["unproven"] } bit_field = { version = "0.10" } -lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["async"] } -lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false } +lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] } +lorawan-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 { #[darling(default)] embassy_prefix: ModulePrefix, + #[allow(unused)] #[darling(default)] config: Option, } 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 @@ #![no_std] #![feature(generic_associated_types)] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 @@ #![no_std] #![feature(generic_associated_types)] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 @@ #![no_std] #![feature(generic_associated_types)] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 @@ #![no_std] #![no_main] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 @@ #![no_std] #![no_main] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 @@ #![no_std] #![no_main] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 @@ #![no_std] #![no_main] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 @@ #![no_std] #![no_main] -#![feature(asm)] #![feature(type_alias_impl_trait)] #[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 = [" embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["sx127x", "time", "defmt"] } -lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["async"] } -lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["default-crypto"] } +lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] } +lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["default-crypto"] } defmt = "0.3" defmt-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 = embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32wl55jc-cm4", "time-driver-tim2", "memory-x", "subghz", "unstable-pac"] } embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time"] } -lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["async"] } -lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "53d2feb43e2f3ddcdc55f0587391b0d3f02d8d93", default-features = false, features = ["default-crypto"] } +lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] } +lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["default-crypto"] } defmt = "0.3" defmt-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 @@ # Before upgrading check that everything is available on all tier1 targets here: # https://rust-lang.github.io/rustup-components-history [toolchain] -channel = "nightly-2021-10-16" +channel = "nightly-2021-12-16" components = [ "rust-src", "rustfmt" ] targets = [ "thumbv7em-none-eabi", "thumbv7m-none-eabi", "thumbv6m-none-eabi", "thumbv7em-none-eabihf", "thumbv8m.main-none-eabihf", "wasm32-unknown-unknown" ]