Merge branch '⬆️-nightly-2022-02-02' into 🦆

Author: yvt

Cargo.lock

@@ -26,16 +26,28 @@ members = [
 ]
 resolver = "2"
 
-[patch.crates-io.riscv]
+[patch.crates-io.riscv-0p5]
 # We need to enable `riscv/inline-asm` to work around
 # <https://github.com/rust-embedded/riscv/issues/69>. However, some external
 # crates depend on `riscv` 0.5.x, which uses the old form of `asm!` with the
-# LLVM syntax, which was moved to `llvm_asm!` when the new inline assembler
-# syntax has landed. Therefore, we have to patch `riscv` 0.5.x with the version
-# that uses the form of inline assembler supported by the current compiler.
+# LLVM syntax, which isn't supported by the current compiler anymore. Therefore,
+# we have to patch `riscv` 0.5.x with the version that uses the form of inline
+# assembler supported by the current compiler.
 git = "https://github.com/r3-os/rust-riscv.git"
+package = "riscv"
 branch = "refresh/0.5"
 
+[patch.crates-io.riscv-0p6]
+# Ditto.
+git = "https://github.com/r3-os/rust-riscv.git"
+package = "riscv"
+branch = "refresh/0.6"
+
+[patch.crates-io.riscv-0p7]
+# Ditto.
+git = "https://github.com/rust-embedded/riscv.git"
+package = "riscv"
+
 [patch.crates-io.riscv-rt]
 # FIXME: This is a work-around for
 # <https://github.com/rust-embedded/riscv/issues/69>. The upstream version of

Cargo.toml

@@ -3,7 +3,6 @@
 #![feature(const_mut_refs)]
 #![feature(const_trait_impl)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 use r3::{
     kernel::{prelude::*, traits, StaticTask},
     prelude::*,

examples/basic/src/main.rs

@@ -5,7 +5,6 @@
 #![feature(asm_sym)]
 #![feature(naked_functions)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 #![no_main]
 #![cfg(target_os = "none")]

examples/basic_gr_peach/src/main.rs

@@ -4,7 +4,6 @@
 #![feature(const_mut_refs)]
 #![feature(const_trait_impl)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 #![no_main]
 #![cfg(target_os = "none")]

examples/basic_nucleo_f401re/src/main.rs

@@ -4,7 +4,6 @@
 #![feature(const_mut_refs)]
 #![feature(const_trait_impl)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 #![no_main]
 #![cfg(target_os = "none")]

examples/basic_rp_pico/src/main.rs

@@ -5,7 +5,6 @@
 #![feature(let_else)]
 #![feature(const_trait_impl)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 #![no_main]
 #![cfg(target_os = "none")]

examples/basic_wio_terminal/src/main.rs

@@ -4,7 +4,6 @@
 #![feature(const_mut_refs)]
 #![feature(const_trait_impl)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 #![no_main]
 #![cfg(target_os = "none")]

examples/smp_rp_pico/src/main.rs

@@ -1 +1 @@
-nightly-2022-01-11
+nightly-2022-02-02

rust-toolchain

@@ -45,7 +45,6 @@
 //! [pdf]: http://infocenter.arm.com/help/topic/com.arm.doc.dui0471e/DUI0471E_developing_for_arm_processors.pdf
 
 #![deny(missing_docs)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 
 #[macro_use]