Merge branch '💥-closure' into 🦆

Author: yvt

README.md

@@ -94,7 +94,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     }
 }
 
-fn task_body(_: usize) {
+fn task_body() {
     // ...
 }
 ```

examples/basic/src/main.rs

@@ -41,14 +41,14 @@ const fn configure_app(b: &mut r3_kernel::Cfg<'_, SystemTraits>) -> Objects {
     }
 }
 
-fn task1_body(_: usize) {
+fn task1_body() {
     log::trace!("COTTAGE = {:#?}", COTTAGE);
     log::trace!("KENREL = {:#?}", System::debug());
 
     COTTAGE.task2.activate().unwrap();
 }
 
-fn task2_body(_: usize) {
+fn task2_body() {
     loop {
         dbg!(System::time().unwrap());
         System::sleep(r3::time::Duration::from_secs(1)).unwrap();

examples/basic_gr_peach/src/main.rs

@@ -71,7 +71,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
 
     // Initialize the serial port
     StartupHook::define()
-        .start(|_| {
+        .start(|| {
             use support_rza1::serial::ScifExt;
 
             #[allow(non_snake_case)]
@@ -99,13 +99,13 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     Objects { task1, task2 }
 }
 
-fn task1_body(_: usize) {
+fn task1_body() {
     support_rza1::sprintln!("COTTAGE = {:?}", COTTAGE);
 
     COTTAGE.task2.activate().unwrap();
 }
 
-fn task2_body(_: usize) {
+fn task2_body() {
     loop {
         support_rza1::sprintln!("time = {:?}", System::time().unwrap());
         System::sleep(r3::time::Duration::from_secs(1)).unwrap();

examples/basic_nucleo_f401re/src/main.rs

@@ -48,7 +48,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     // Initialize RTT (Real-Time Transfer) with a single up channel and set
     // it as the print channel for the printing macros
     StartupHook::define()
-        .start(|_| {
+        .start(|| {
             rtt_target::rtt_init_print!();
         })
         .finish(b);
@@ -71,13 +71,13 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     }
 }
 
-fn task1_body(_: usize) {
+fn task1_body() {
     rtt_target::rprintln!("COTTAGE = {:?}", COTTAGE);
 
     COTTAGE.task2.activate().unwrap();
 }
 
-fn task2_body(_: usize) {
+fn task2_body() {
     loop {
         rtt_target::rprintln!("time = {:?}", System::time().unwrap());
         System::sleep(r3::time::Duration::from_secs(1)).unwrap();

examples/basic_rp_pico/src/main.rs

@@ -74,7 +74,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     b.num_task_priority_levels(4);
 
     StartupHook::define()
-        .start(|_| {
+        .start(|| {
             // Configure peripherals
             let p = unsafe { rp2040::Peripherals::steal() };
             support_rp2040::clock::init_clock(
@@ -131,13 +131,13 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     }
 }
 
-fn task1_body(_: usize) {
+fn task1_body() {
     support_rp2040::sprintln!("COTTAGE = {:?}", COTTAGE);
 
     COTTAGE.task2.activate().unwrap();
 }
 
-fn task2_body(_: usize) {
+fn task2_body() {
     let p = unsafe { rp2040::Peripherals::steal() };
 
     // <https://github.com/jannic/rp-microcontroller-rs/blob/master/boards/rp-pico/examples/blink/main.rs>

examples/basic_wio_terminal/src/main.rs

@@ -110,7 +110,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
 
     // Register a hook to initialize hardware
     StartupHook::define()
-        .start(|_| {
+        .start(|| {
             init_hardware();
         })
         .finish(b);
@@ -270,7 +270,7 @@ fn init_hardware() {
 // ----------------------------------------------------------------------------
 
 /// The task responsible for outputting messages to the console.
-fn noisy_task_body(_: usize) {
+fn noisy_task_body() {
     let _ = writeln!(Console, "////////////////////////////////");
     let _ = writeln!(
         Console,
@@ -335,7 +335,7 @@ impl Write for Console {
 }
 
 /// The task responsible for blinking the user LED.
-fn blink_task_body(_: usize) {
+fn blink_task_body() {
     let mut st = BLINK_ST.lock();
     let st = st.as_mut().unwrap();
     loop {
@@ -345,7 +345,7 @@ fn blink_task_body(_: usize) {
 }
 
 /// The task responsible for rendering the console.
-fn console_task_body(_: usize) {
+fn console_task_body() {
     let mut lcd = borrow_lcd();
 
     let bg_style = primitives::PrimitiveStyleBuilder::new()
@@ -428,7 +428,7 @@ fn console_task_body(_: usize) {
 }
 
 /// The task responsible for rendering an animated image.
-fn animation_task_body(_: usize) {
+fn animation_task_body() {
     let images = r3_example_common::ANIMATION_FRAMES_565;
     for image in images.iter().cycle() {
         let mut lcd = borrow_lcd();
@@ -447,7 +447,7 @@ fn animation_task_body(_: usize) {
 static BUTTON_STATE: AtomicUsize = AtomicUsize::new(0);
 
 /// The task responsible for reporting button events.
-fn button_reporter_task_body(_: usize) {
+fn button_reporter_task_body() {
     let mut st = 0;
     loop {
         System::park().unwrap();
@@ -592,7 +592,7 @@ fn USB_TRCPT1() {
     poll_usb();
 }
 
-fn usb_poll_timer_handler(_: usize) {
+fn usb_poll_timer_handler() {
     poll_usb();
 }
 
@@ -613,7 +613,7 @@ fn set_usb_polling(b: bool) {
 }
 
 /// The task to print the data received by the USB serial endpoint
-fn usb_in_task_body(_: usize) {
+fn usb_in_task_body() {
     let mut data = arrayvec::ArrayVec::<u8, USB_BUF_CAP>::new();
     loop {
         // Get next data to output

examples/smp_rp_pico/src/core0.rs

@@ -55,7 +55,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     b.num_task_priority_levels(4);
 
     StartupHook::define()
-        .start(|_| {
+        .start(|| {
             // Configure peripherals
             let p = unsafe { rp2040::Peripherals::steal() };
             support_rp2040::clock::init_clock(
@@ -108,7 +108,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
         .finish(b);
     StaticInterruptHandler::define()
         .line(int_fifo)
-        .start(|_| {
+        .start(|| {
             let p = unsafe { rp2040::Peripherals::steal() };
             let sio = p.SIO;
             while sio.fifo_st.read().vld().bit_is_set() {
@@ -132,13 +132,13 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     }
 }
 
-fn task1_body(_: usize) {
+fn task1_body() {
     support_rp2040::sprintln!("COTTAGE = {:?}", COTTAGE);
 
     COTTAGE.task2.activate().unwrap();
 }
 
-fn task2_body(_: usize) {
+fn task2_body() {
     loop {
         support_rp2040::sprintln!(" 0   | core0: {:?}", System::time().unwrap());
         System::sleep(r3::time::Duration::from_millis(700)).unwrap();

examples/smp_rp_pico/src/core1.rs

@@ -189,7 +189,7 @@ const fn configure_app(b: &mut r3_kernel::Cfg<SystemTraits>) -> Objects {
     Objects { task1 }
 }
 
-fn task1_body(_: usize) {
+fn task1_body() {
     let c1 = Core1(());
     write_bytes(c1, b"core1: task1 is running\n");
 

src/r3/src/sync/mutex.rs

@@ -78,7 +78,7 @@ pub struct GenericMutex<Cell, Mutex> {
 ///     Objects { task2, mutex }
 /// }
 ///
-/// fn task1_body(_: usize) {
+/// fn task1_body() {
 ///     let mut guard = COTTAGE.mutex.lock().unwrap();
 ///
 ///     // Although `task2` has a higher priority, it's unable to
@@ -89,7 +89,7 @@ pub struct GenericMutex<Cell, Mutex> {
 ///     *guard = 1;
 /// }
 ///
-/// fn task2_body(_: usize) {
+/// fn task2_body() {
 ///     let mut guard = COTTAGE.mutex.lock().unwrap();
 ///     assert_eq!(*guard, 1);
 ///     *guard = 2;

src/r3/src/sync/recursive_mutex.rs

@@ -69,7 +69,7 @@ pub struct GenericRecursiveMutex<Cell, Mutex> {
 ///     Objects { mutex }
 /// }
 ///
-/// fn task1_body(_: usize) {
+/// fn task1_body() {
 ///     let guard = COTTAGE.mutex.lock().unwrap();
 ///     assert_eq!(guard.get(), 0);
 ///     guard.set(1);