Merge #2215

2215: remove all uses of unstable const_in_array_repeat_expressions feature r=bradjc a=hudson-ayers ### Pull Request Overview This pull request removes all uses of the unstable `const_in_array_repeat_expressions` feature. It was originally necessary in order to have ergonomic scheduler components, but a subset of the feature that is sufficient for our use was accidentally stabilized, and the Rust maintainers are moving to make that stabilization permanent (see rust-lang/rust#79270). So this is an easy way to get rid of an unstable feature. ### Testing Strategy This pull request was tested by compiling and flashing several apps on an Imix. ### TODO or Help Wanted N/A ### Documentation Updated - [x] No updates are required. ### Formatting - [x] Ran `make prepush`. Co-authored-by: Hudson Ayers <hayers@stanford.edu>
tock · Dec 2, 2020 · b939473 · b939473
2 parents 40d7961 + 60fb214
commit b939473
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 21 deletions.
diff --git a/boards/acd52832/src/main.rs b/boards/acd52832/src/main.rs
@@ -4,7 +4,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use capsules::virtual_alarm::VirtualMuxAlarm;

diff --git a/boards/arty_e21/src/main.rs b/boards/arty_e21/src/main.rs
@@ -4,7 +4,7 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_fn, const_in_array_repeat_expressions)]
+#![feature(const_fn)]
 
 use arty_e21_chip::chip::ArtyExxDefaultPeripherals;
 use capsules::virtual_alarm::{MuxAlarm, VirtualMuxAlarm};

diff --git a/boards/components/src/lib.rs b/boards/components/src/lib.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(const_in_array_repeat_expressions)]
 
 pub mod adc;
 pub mod alarm;

diff --git a/boards/components/src/sched/cooperative.rs b/boards/components/src/sched/cooperative.rs
@@ -23,7 +23,8 @@ macro_rules! coop_component_helper {
         use core::mem::MaybeUninit;
         use kernel::static_buf;
         use kernel::CoopProcessNode;
-        static mut BUF: [MaybeUninit<CoopProcessNode<'static>>; $N] = [MaybeUninit::uninit(); $N];
+        const UNINIT: MaybeUninit<CoopProcessNode<'static>> = MaybeUninit::uninit();
+        static mut BUF: [MaybeUninit<CoopProcessNode<'static>>; $N] = [UNINIT; $N];
         &mut BUF
     };};
 }

diff --git a/boards/components/src/sched/mlfq.rs b/boards/components/src/sched/mlfq.rs
@@ -23,7 +23,8 @@ macro_rules! mlfq_component_helper {
         static mut BUF1: MaybeUninit<VirtualMuxAlarm<'static, $A>> = MaybeUninit::uninit();
         static mut BUF2: MaybeUninit<MLFQSched<'static, VirtualMuxAlarm<'static, $A>>> =
             MaybeUninit::uninit();
-        static mut BUF3: [MaybeUninit<MLFQProcessNode<'static>>; $N] = [MaybeUninit::uninit(); $N];
+        const UNINIT: MaybeUninit<MLFQProcessNode<'static>> = MaybeUninit::uninit();
+        static mut BUF3: [MaybeUninit<MLFQProcessNode<'static>>; $N] = [UNINIT; $N];
         (&mut BUF1, &mut BUF2, &mut BUF3)
     };};
 }

diff --git a/boards/components/src/sched/round_robin.rs b/boards/components/src/sched/round_robin.rs
@@ -24,8 +24,8 @@ macro_rules! rr_component_helper {
         use core::mem::MaybeUninit;
         use kernel::static_buf;
         use kernel::RoundRobinProcessNode;
-        static mut BUF: [MaybeUninit<RoundRobinProcessNode<'static>>; $N] =
-            [MaybeUninit::uninit(); $N];
+        const UNINIT: MaybeUninit<RoundRobinProcessNode<'static>> = MaybeUninit::uninit();
+        static mut BUF: [MaybeUninit<RoundRobinProcessNode<'static>>; $N] = [UNINIT; $N];
         &mut BUF
     };};
 }

diff --git a/boards/earlgrey-nexysvideo/src/main.rs b/boards/earlgrey-nexysvideo/src/main.rs
@@ -6,7 +6,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 
 use capsules::virtual_alarm::{MuxAlarm, VirtualMuxAlarm};
 use capsules::virtual_hmac::VirtualMuxHmac;

diff --git a/boards/hail/src/main.rs b/boards/hail/src/main.rs
@@ -7,7 +7,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use capsules::virtual_alarm::VirtualMuxAlarm;

diff --git a/boards/hifive1/src/main.rs b/boards/hifive1/src/main.rs
@@ -8,7 +8,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 
 use capsules::virtual_alarm::{MuxAlarm, VirtualMuxAlarm};
 use e310x::chip::E310xDefaultPeripherals;

diff --git a/boards/imix/src/main.rs b/boards/imix/src/main.rs
@@ -7,7 +7,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 mod imix_components;

diff --git a/boards/msp_exp432p401r/src/main.rs b/boards/msp_exp432p401r/src/main.rs
@@ -6,7 +6,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use components::gpio::GpioComponent;

diff --git a/boards/nano33ble/src/main.rs b/boards/nano33ble/src/main.rs
@@ -6,7 +6,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use kernel::capabilities;

diff --git a/boards/nordic/nrf52840_dongle/src/main.rs b/boards/nordic/nrf52840_dongle/src/main.rs
@@ -7,7 +7,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use capsules::virtual_alarm::VirtualMuxAlarm;

diff --git a/boards/nordic/nrf52840dk/src/main.rs b/boards/nordic/nrf52840dk/src/main.rs
@@ -65,7 +65,6 @@
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
 #![deny(missing_docs)]
-#![feature(const_in_array_repeat_expressions)]
 
 use capsules::net::ieee802154::MacAddress;
 use capsules::net::ipv6::ip_utils::IPAddr;

diff --git a/boards/nordic/nrf52dk/src/main.rs b/boards/nordic/nrf52dk/src/main.rs
@@ -64,7 +64,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use capsules::virtual_alarm::VirtualMuxAlarm;

diff --git a/boards/nucleo_f429zi/src/main.rs b/boards/nucleo_f429zi/src/main.rs
@@ -6,7 +6,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use capsules::virtual_alarm::VirtualMuxAlarm;

diff --git a/boards/nucleo_f446re/src/main.rs b/boards/nucleo_f446re/src/main.rs
@@ -6,7 +6,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use capsules::virtual_alarm::VirtualMuxAlarm;

diff --git a/boards/redboard_artemis_nano/src/main.rs b/boards/redboard_artemis_nano/src/main.rs
@@ -6,7 +6,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use apollo3::chip::Apollo3DefaultPeripherals;

diff --git a/boards/stm32f3discovery/src/main.rs b/boards/stm32f3discovery/src/main.rs
@@ -6,7 +6,6 @@
 // Disable this attribute when documenting, as a workaround for
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
-#![feature(const_in_array_repeat_expressions)]
 #![deny(missing_docs)]
 
 use capsules::lsm303dlhc;

diff --git a/boards/stm32f412gdiscovery/src/main.rs b/boards/stm32f412gdiscovery/src/main.rs
@@ -7,7 +7,6 @@
 // https://github.com/rust-lang/rust/issues/62184.
 #![cfg_attr(not(doc), no_main)]
 #![deny(missing_docs)]
-#![feature(const_in_array_repeat_expressions)]
 use capsules::virtual_alarm::VirtualMuxAlarm;
 use components::gpio::GpioComponent;
 use components::rng::RngComponent;