From 3f2cf479272a2b15a59a9d6751d67703e33bc1fa Mon Sep 17 00:00:00 2001 From: yvt Date: Thu, 10 Mar 2022 12:54:10 +0900 Subject: [PATCH] refactor: remove `#![feature(const_fn_fn_ptr_basics)]` The `const_fn_fn_ptr_basics` feature was stabilized by . --- README.md | 1 - examples/basic/src/main.rs | 1 - examples/basic_gr_peach/src/main.rs | 1 - examples/basic_nucleo_f401re/src/main.rs | 1 - examples/basic_rp_pico/src/main.rs | 1 - examples/basic_wio_terminal/src/main.rs | 1 - examples/smp_rp_pico/src/main.rs | 1 - src/r3/src/lib.rs | 1 - src/r3/src/tests.rs | 3 +-- src/r3_core/src/bind.rs | 2 -- src/r3_core/src/kernel/timer.rs | 2 -- src/r3_core/src/lib.md | 1 - src/r3_core/src/lib.rs | 1 - src/r3_kernel/src/lib.rs | 1 - src/r3_port_arm/src/lib.rs | 1 - src/r3_port_arm_m/src/lib.rs | 1 - src/r3_port_arm_m_test_driver/src/main.rs | 1 - src/r3_port_arm_test_driver/src/main.rs | 1 - src/r3_port_riscv/src/lib.rs | 1 - src/r3_port_riscv_test_driver/src/main.rs | 1 - src/r3_port_std/src/lib.md | 1 - src/r3_port_std/tests/test_suite.rs | 1 - src/r3_portkit/src/lib.rs | 1 - src/r3_support_rp2040/src/lib.rs | 1 - src/r3_support_rza1/src/lib.rs | 1 - src/r3_test_suite/src/lib.rs | 1 - 26 files changed, 1 insertion(+), 29 deletions(-) diff --git a/README.md b/README.md index ed95df2cf7..e01cd3f5ef 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,6 @@ The R3 original kernel is provided as a separate package [`r3_kernel`][]. ## Example ```rust -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/examples/basic/src/main.rs b/examples/basic/src/main.rs index 3ae89bb08a..a27a5ac865 100644 --- a/examples/basic/src/main.rs +++ b/examples/basic/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(const_mut_refs)] diff --git a/examples/basic_gr_peach/src/main.rs b/examples/basic_gr_peach/src/main.rs index 7c4e705ecd..123993e586 100644 --- a/examples/basic_gr_peach/src/main.rs +++ b/examples/basic_gr_peach/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(const_mut_refs)] diff --git a/examples/basic_nucleo_f401re/src/main.rs b/examples/basic_nucleo_f401re/src/main.rs index e027d84cfa..17b4dc9f27 100644 --- a/examples/basic_nucleo_f401re/src/main.rs +++ b/examples/basic_nucleo_f401re/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/examples/basic_rp_pico/src/main.rs b/examples/basic_rp_pico/src/main.rs index 04bdc1d538..51b164f466 100644 --- a/examples/basic_rp_pico/src/main.rs +++ b/examples/basic_rp_pico/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/examples/basic_wio_terminal/src/main.rs b/examples/basic_wio_terminal/src/main.rs index a18a2e3a4d..fc80addc0b 100644 --- a/examples/basic_wio_terminal/src/main.rs +++ b/examples/basic_wio_terminal/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/examples/smp_rp_pico/src/main.rs b/examples/smp_rp_pico/src/main.rs index b1940c9420..03200b34a9 100644 --- a/examples/smp_rp_pico/src/main.rs +++ b/examples/smp_rp_pico/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/src/r3/src/lib.rs b/src/r3/src/lib.rs index 2e87a4a004..7eb45a3825 100644 --- a/src/r3/src/lib.rs +++ b/src/r3/src/lib.rs @@ -1,7 +1,6 @@ #![feature(arbitrary_enum_discriminant)] #![feature(type_changing_struct_update)] #![feature(const_precise_live_drops)] -#![feature(const_fn_fn_ptr_basics)] #![feature(type_alias_impl_trait)] #![feature(const_trait_impl)] #![feature(const_mut_refs)] diff --git a/src/r3/src/tests.rs b/src/r3/src/tests.rs index 47b002bc93..1b31efe488 100644 --- a/src/r3/src/tests.rs +++ b/src/r3/src/tests.rs @@ -8,8 +8,7 @@ pub(crate) macro doc_test( $( #[doc = $doc:expr] )* ) {concat!( ignore_if_port_std_does_not_support_target!($head), "\n ", -"# #![feature(const_fn_fn_ptr_basics)] - # #![feature(const_refs_to_cell)] +"# #![feature(const_refs_to_cell)] # #![feature(const_trait_impl)] # #![feature(const_mut_refs)] # #![deny(unsafe_op_in_unsafe_fn)] diff --git a/src/r3_core/src/bind.rs b/src/r3_core/src/bind.rs index 082513076f..f8211224f6 100644 --- a/src/r3_core/src/bind.rs +++ b/src/r3_core/src/bind.rs @@ -692,7 +692,6 @@ impl<'pool, System, T> DivideBind<'pool, System, T> { /// # Examples /// /// ```rust -/// #![feature(const_fn_fn_ptr_basics)] /// #![feature(const_trait_impl)] /// #![feature(const_mut_refs)] /// use r3_core::{bind::Bind, kernel::{Cfg, traits}, prelude::*}; @@ -821,7 +820,6 @@ impl<'pool, const LEN: usize, System, T> const UnzipBind for Bind<'pool, System, /// # Example /// /// ```rust -/// #![feature(const_fn_fn_ptr_basics)] /// #![feature(const_trait_impl)] /// #![feature(const_mut_refs)] /// use r3_core::{ diff --git a/src/r3_core/src/kernel/timer.rs b/src/r3_core/src/kernel/timer.rs index a5ee26e501..c374c87b10 100644 --- a/src/r3_core/src/kernel/timer.rs +++ b/src/r3_core/src/kernel/timer.rs @@ -272,7 +272,6 @@ define_object! { /// ## Periodic Timer /// /// ```rust -/// # #![feature(const_fn_fn_ptr_basics)] /// # #![feature(const_trait_impl)] /// # #![feature(const_mut_refs)] /// use r3_core::{kernel::{Cfg, StaticTimer, traits}, time::Duration}; @@ -313,7 +312,6 @@ define_object! { /// ## One-Shot Timer /// /// ```rust -/// # #![feature(const_fn_fn_ptr_basics)] /// # #![feature(const_trait_impl)] /// # #![feature(const_mut_refs)] /// use r3_core::{kernel::{Cfg, StaticTimer, traits, prelude::*}, time::Duration}; diff --git a/src/r3_core/src/lib.md b/src/r3_core/src/lib.md index dd41f56a7a..5e8a933309 100644 --- a/src/r3_core/src/lib.md +++ b/src/r3_core/src/lib.md @@ -103,7 +103,6 @@ fn task_body() { Configuration functions are highly composable as they can make nested calls to other configuration functions. In some sense, this is a way to attribute a certain semantics to a group of kernel objects, encapsulate them, and expose a higher-level interface. For example, a [mutex object] similar to `std::sync::Mutex` can be created by combining [`kernel::Mutex`]`` (a low-level mutex object) and a [`hunk::Hunk`]`>` (a typed hunk), which in turn is built on top of [`kernel::Hunk`]`` (a low-level untyped hunk). ```rust -# #![feature(const_fn_fn_ptr_basics)] # #![feature(const_trait_impl)] # #![feature(const_mut_refs)] # use r3_core::kernel::{Cfg, traits}; diff --git a/src/r3_core/src/lib.rs b/src/r3_core/src/lib.rs index 31c7f05bec..62c0336158 100644 --- a/src/r3_core/src/lib.rs +++ b/src/r3_core/src/lib.rs @@ -10,7 +10,6 @@ #![feature(const_precise_live_drops)] #![feature(const_raw_ptr_comparison)] #![feature(generic_associated_types)] -#![feature(const_fn_fn_ptr_basics)] #![feature(const_slice_first_last)] #![feature(cfg_target_has_atomic)] // `#[cfg(target_has_atomic_load_store)]` #![feature(const_cell_into_inner)] diff --git a/src/r3_kernel/src/lib.rs b/src/r3_kernel/src/lib.rs index 3f4cf4e85b..de777a2408 100644 --- a/src/r3_kernel/src/lib.rs +++ b/src/r3_kernel/src/lib.rs @@ -3,7 +3,6 @@ #![feature(maybe_uninit_uninit_array)] #![feature(const_precise_live_drops)] #![feature(const_raw_ptr_comparison)] -#![feature(const_fn_fn_ptr_basics)] #![feature(cfg_target_has_atomic)] // `#[cfg(target_has_atomic_load_store)]` #![feature(const_intrinsic_copy)] #![feature(exhaustive_patterns)] // `let Ok(()) = Ok::<(), !>(())` diff --git a/src/r3_port_arm/src/lib.rs b/src/r3_port_arm/src/lib.rs index 2b65a7c8ad..d3d6023818 100644 --- a/src/r3_port_arm/src/lib.rs +++ b/src/r3_port_arm/src/lib.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_ptr_offset_from)] #![feature(const_refs_to_cell)] #![feature(const_ptr_offset)] diff --git a/src/r3_port_arm_m/src/lib.rs b/src/r3_port_arm_m/src/lib.rs index bc1f7ccdd0..b4dc9a3c1d 100644 --- a/src/r3_port_arm_m/src/lib.rs +++ b/src/r3_port_arm_m/src/lib.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_ptr_offset_from)] #![feature(generic_const_exprs)] #![feature(const_refs_to_cell)] diff --git a/src/r3_port_arm_m_test_driver/src/main.rs b/src/r3_port_arm_m_test_driver/src/main.rs index c266c0e659..361e60e771 100644 --- a/src/r3_port_arm_m_test_driver/src/main.rs +++ b/src/r3_port_arm_m_test_driver/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/src/r3_port_arm_test_driver/src/main.rs b/src/r3_port_arm_test_driver/src/main.rs index 3283dc37cd..5b91439013 100644 --- a/src/r3_port_arm_test_driver/src/main.rs +++ b/src/r3_port_arm_test_driver/src/main.rs @@ -3,7 +3,6 @@ //! padding-bottom: 100%" href="http://derpibooru.org/2079083" //! title="Screwdriver"> #![doc = include_str!("./common.md")] -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/src/r3_port_riscv/src/lib.rs b/src/r3_port_riscv/src/lib.rs index 11607fbccb..c5631f11a4 100644 --- a/src/r3_port_riscv/src/lib.rs +++ b/src/r3_port_riscv/src/lib.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(generic_const_exprs)] #![feature(const_trait_impl)] #![feature(naked_functions)] diff --git a/src/r3_port_riscv_test_driver/src/main.rs b/src/r3_port_riscv_test_driver/src/main.rs index 3aabdc670e..89711b689e 100644 --- a/src/r3_port_riscv_test_driver/src/main.rs +++ b/src/r3_port_riscv_test_driver/src/main.rs @@ -1,4 +1,3 @@ -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(const_ptr_offset)] diff --git a/src/r3_port_std/src/lib.md b/src/r3_port_std/src/lib.md index 316fb7ad78..c2de2e1ea5 100644 --- a/src/r3_port_std/src/lib.md +++ b/src/r3_port_std/src/lib.md @@ -3,7 +3,6 @@ The port for running [`::r3_kernel`][] in a hosted environment # Usage ```rust -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(const_mut_refs)] diff --git a/src/r3_port_std/tests/test_suite.rs b/src/r3_port_std/tests/test_suite.rs index 659120cb34..144098ed72 100644 --- a/src/r3_port_std/tests/test_suite.rs +++ b/src/r3_port_std/tests/test_suite.rs @@ -1,5 +1,4 @@ //! Runs test cases defined in `r3_test_suite`. -#![feature(const_fn_fn_ptr_basics)] #![feature(const_refs_to_cell)] #![feature(const_trait_impl)] #![feature(const_mut_refs)] diff --git a/src/r3_portkit/src/lib.rs b/src/r3_portkit/src/lib.rs index 2fa6093d37..2b7f71855e 100644 --- a/src/r3_portkit/src/lib.rs +++ b/src/r3_portkit/src/lib.rs @@ -1,5 +1,4 @@ //! R3 PortKit -#![feature(const_fn_fn_ptr_basics)] #![feature(generic_const_exprs)] #![feature(adt_const_params)] #![feature(naked_functions)] diff --git a/src/r3_support_rp2040/src/lib.rs b/src/r3_support_rp2040/src/lib.rs index 46c60059bd..ef29b700b3 100644 --- a/src/r3_support_rp2040/src/lib.rs +++ b/src/r3_support_rp2040/src/lib.rs @@ -3,7 +3,6 @@ //! //! [R3]: ::r3 //! [Raspberry Pi Pico]: https://pico.raspberrypi.org -#![feature(const_fn_fn_ptr_basics)] #![feature(exhaustive_patterns)] #![feature(const_trait_impl)] #![feature(const_mut_refs)] diff --git a/src/r3_support_rza1/src/lib.rs b/src/r3_support_rza1/src/lib.rs index 2a2c77fa5f..a1c4408096 100644 --- a/src/r3_support_rza1/src/lib.rs +++ b/src/r3_support_rza1/src/lib.rs @@ -4,7 +4,6 @@ //! [R3]: ::r3 //! [RZ/A1H]: https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rz/rza/rza1h.html //! [GR-PEACH]: https://www.renesas.com/us/en/products/gadget-renesas/boards/gr-peach.html -#![feature(const_fn_fn_ptr_basics)] #![feature(const_trait_impl)] #![feature(const_mut_refs)] #![cfg_attr( diff --git a/src/r3_test_suite/src/lib.rs b/src/r3_test_suite/src/lib.rs index 4d4c2b81f6..c40a923792 100644 --- a/src/r3_test_suite/src/lib.rs +++ b/src/r3_test_suite/src/lib.rs @@ -1,5 +1,4 @@ #![feature(const_fn_floating_point_arithmetic)] -#![feature(const_fn_fn_ptr_basics)] #![feature(cfg_target_has_atomic)] #![feature(const_transmute_copy)] #![feature(const_refs_to_cell)]