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

r3-os · Feb 2, 2022 · 2168054 · 2168054
2 parents 45d80ab + fcc380e
commit 2168054
Show file tree

Hide file tree

Showing 23 changed files with 21 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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

diff --git a/examples/basic/src/main.rs b/examples/basic/src/main.rs
@@ -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::*,

diff --git a/examples/basic_gr_peach/src/main.rs b/examples/basic_gr_peach/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")]

diff --git a/examples/basic_nucleo_f401re/src/main.rs b/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")]

diff --git a/examples/basic_rp_pico/src/main.rs b/examples/basic_rp_pico/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")]

diff --git a/examples/basic_wio_terminal/src/main.rs b/examples/basic_wio_terminal/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")]

diff --git a/examples/smp_rp_pico/src/main.rs b/examples/smp_rp_pico/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")]

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2022-01-11
+nightly-2022-02-02
diff --git a/src/arm_semihosting/src/lib.rs b/src/arm_semihosting/src/lib.rs
@@ -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]

diff --git a/src/r3_core/src/lib.rs b/src/r3_core/src/lib.rs
@@ -40,7 +40,6 @@
 #![feature(untagged_unions)] // `union` with non-`Copy` fields
 #![cfg_attr(test, feature(is_sorted))]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![doc = include_str!("./lib.md")]
 #![doc = include_str!("./common.md")]

diff --git a/src/r3_kernel/src/lib.rs b/src/r3_kernel/src/lib.rs
@@ -28,7 +28,6 @@
 #![feature(let_else)]
 #![feature(doc_cfg)] // `#[doc(cfg(...))]`
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![doc = include_str!("./lib.md")]
 #![doc = include_str!("./common.md")]

diff --git a/src/r3_port_arm/src/lib.rs b/src/r3_port_arm/src/lib.rs
@@ -11,7 +11,6 @@
 #![feature(naked_functions)]
 #![feature(slice_ptr_len)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![allow(clippy::verbose_bit_mask)] // questionable
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![doc = include_str!("./lib.md")]

diff --git a/src/r3_port_arm_m/src/lib.rs b/src/r3_port_arm_m/src/lib.rs
@@ -11,7 +11,6 @@
 #![feature(naked_functions)]
 #![feature(const_trait_impl)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![doc = include_str!("./lib.md")]
 #![no_std]

diff --git a/src/r3_port_arm_m_test_driver/src/main.rs b/src/r3_port_arm_m_test_driver/src/main.rs
@@ -4,7 +4,6 @@
 #![feature(const_fn_fn_ptr_basics)]
 #![feature(const_trait_impl)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![cfg_attr(feature = "run", no_std)]
 #![cfg_attr(feature = "run", no_main)]
 

diff --git a/src/r3_port_arm_test_driver/src/main.rs b/src/r3_port_arm_test_driver/src/main.rs
@@ -10,7 +10,6 @@
 #![feature(const_trait_impl)]
 #![feature(asm_sym)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![cfg_attr(feature = "run", no_std)]
 #![cfg_attr(feature = "run", no_main)]
 #![recursion_limit = "1000"]

diff --git a/src/r3_port_riscv/src/lib.rs b/src/r3_port_riscv/src/lib.rs
@@ -11,7 +11,6 @@
 #![feature(const_trait_impl)]
 #![feature(generic_const_exprs)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![doc = include_str!("./lib.md")]
 #![doc = include_str!("./common.md")]

diff --git a/src/r3_port_riscv_test_driver/src/main.rs b/src/r3_port_riscv_test_driver/src/main.rs
@@ -8,7 +8,6 @@
 #![feature(decl_macro)]
 #![feature(const_ptr_offset)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![cfg_attr(feature = "run", no_std)]
 #![cfg_attr(feature = "run", no_main)]
 

diff --git a/src/r3_port_std/src/lib.rs b/src/r3_port_std/src/lib.rs
@@ -6,7 +6,6 @@
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![doc = include_str!("./lib.md")]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 use atomic_ref::AtomicRef;
 use once_cell::sync::OnceCell;
 use r3_core::{

diff --git a/src/r3_portkit/src/lib.rs b/src/r3_portkit/src/lib.rs
@@ -6,7 +6,6 @@
 #![feature(decl_macro)]
 #![feature(const_fn_fn_ptr_basics)]
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 
 #[cfg(doc)]

diff --git a/src/r3_support_rp2040/src/lib.rs b/src/r3_support_rp2040/src/lib.rs
@@ -10,7 +10,6 @@
 #![feature(const_trait_impl)]
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 
 #[cfg(doc)]

diff --git a/src/r3_support_rza1/src/lib.rs b/src/r3_support_rza1/src/lib.rs
@@ -10,7 +10,6 @@
 #![feature(const_trait_impl)]
 #![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![deny(unsupported_naked_functions)]
 #![no_std]
 
 /// Used by `use_os_timer!`

diff --git a/src/r3_test_suite/src/lib.rs b/src/r3_test_suite/src/lib.rs
@@ -14,7 +14,6 @@
 #![feature(assert_matches)]
 #![deny(unsafe_op_in_unsafe_fn)]
 #![allow(clippy::eq_op)] // we want to test `PartialEq` implementations
-#![deny(unsupported_naked_functions)]
 #![doc = include_str!("./lib.md")]
 #![doc = include_str!("./common.md")]
 #![no_std]