Merge branch '⬆️-nightly-2020-11-25' into 🦆

Author: yvt

rust-toolchain

@@ -1 +1 @@
-nightly-2020-10-01
+nightly-2020-11-25

src/r3/src/utils.rs

@@ -7,7 +7,7 @@ use core::marker::PhantomData;
 /// Conditional type
 macro_rules! If {
     ( if ($cond:expr) { $t:ty } else { $f:ty } ) => {
-        <crate::utils::Conditional<$t, $f, $cond> as crate::utils::TypeFn>::Output
+        <crate::utils::Conditional<$t, $f, {$cond}> as crate::utils::TypeFn>::Output
     };
     ( if ($cond:expr) { $t:ty } else if $($rest:tt)* ) => {
         If! { if ($cond) { $t } else { If!{ if $($rest)* } } }

src/r3_port_arm/src/startup/imp.rs

@@ -30,7 +30,6 @@ impl VectorTable {
     }
 }
 
-#[naked]
 #[inline(always)]
 pub fn start<System: EntryPoint + StartupOptions>() {
     unsafe {

src/r3_port_riscv/src/threading/cfg.rs

@@ -61,7 +61,6 @@ macro_rules! use_port {
                     unsafe { PORT_STATE.port_boot::<Self>() };
                 }
 
-                #[naked]
                 #[inline(always)]
                 unsafe fn exception_handler() -> ! {
                     unsafe { State::exception_handler::<Self>() };

src/r3_port_riscv/src/threading/imp.rs

@@ -1113,7 +1113,6 @@ impl State {
     }
 
     /// Implements [`crate::EntryPoint::exception_handler`].
-    #[naked]
     #[inline(always)]
     pub unsafe fn exception_handler<System: PortInstance>() -> ! {
         const FRAME_SIZE: usize = if cfg!(target_feature = "f") {

src/r3_portkit/src/utils.rs

@@ -10,7 +10,7 @@ pub use r3::utils::Init;
 /// Conditional type
 macro_rules! If {
     ( if ($cond:expr) { $t:ty } else { $f:ty } ) => {
-        <crate::utils::Conditional<$t, $f, $cond> as crate::utils::TypeFn>::Output
+        <crate::utils::Conditional<$t, $f, {$cond}> as crate::utils::TypeFn>::Output
     };
     ( if ($cond:expr) { $t:ty } else if $($rest:tt)* ) => {
         If! { if ($cond) { $t } else { If!{ if $($rest)* } } }

src/r3_test_suite/src/lib.rs

@@ -12,6 +12,7 @@
 #![feature(array_windows)]
 #![feature(unsafe_block_in_unsafe_fn)] // `unsafe fn` doesn't imply `unsafe {}`
 #![deny(unsafe_op_in_unsafe_fn)]
+#![allow(clippy::eq_op)] // we want to test `PartialEq` implementations
 #![doc(include = "./lib.md")]
 #![doc(include = "./common.md")]
 #![no_std]