Merge branch '♻️-generic-arg-infer' into 🦆

Author: yvt

examples/basic_wio_terminal/src/main.rs

@@ -1,4 +1,5 @@
 #![feature(const_refs_to_cell)]
+#![feature(generic_arg_infer)]
 #![feature(const_trait_impl)]
 #![feature(naked_functions)]
 #![feature(const_mut_refs)]
@@ -558,7 +559,7 @@ const USB_BUF_CAP: usize = 64;
 /// The queue through which received data is passed from `poll_usb` to
 /// `usb_in_task_body`
 static USB_BUF_IN: PrimaskMutex<RefCell<([u8; USB_BUF_CAP], usize)>> =
-    PrimaskMutex::new(RefCell::new(([0; USB_BUF_CAP], 0)));
+    PrimaskMutex::new(RefCell::new(([0; _], 0)));
 
 /// USB interrupt handler
 fn poll_usb() {
@@ -705,7 +706,7 @@ mod queue {
             Self {
                 st: StaticMutex::define()
                     .init(|| QueueSt {
-                        buf: [T::INIT; CAP],
+                        buf: [T::INIT; _],
                         read_i: 0,
                         len: 0,
                         waiting_reader: None,

examples/smp_rp_pico/src/core1.rs

@@ -100,11 +100,11 @@ static CORE1_VECTOR_TABLE: VectorTable<[unsafe extern "C" fn(); 48]> = {
         fn _core1_stack_start();
     }
 
-    let mut table = [unhandled as _; 48];
+    let mut table = [unhandled as _; _];
 
     let mut i = 0;
     let kernel_handler_table = <SystemTraits as r3_kernel::KernelCfg2>::INTERRUPT_HANDLERS;
-    while i < 48 {
+    while i < table.len() {
         if let Some(handler) = kernel_handler_table.get(i) {
             table[i] = handler;
         }

examples/smp_rp_pico/src/main.rs

@@ -1,4 +1,5 @@
 #![feature(const_refs_to_cell)]
+#![feature(generic_arg_infer)]
 #![feature(const_trait_impl)]
 #![feature(naked_functions)]
 #![feature(const_mut_refs)]

src/r3_port_arm/src/lib.rs

@@ -1,5 +1,6 @@
 #![feature(const_ptr_offset_from)]
 #![feature(const_refs_to_cell)]
+#![feature(generic_arg_infer)]
 #![feature(const_trait_impl)]
 #![feature(naked_functions)]
 #![feature(const_mut_refs)]

src/r3_port_arm/src/startup/imp.rs

@@ -15,7 +15,7 @@ impl VectorTable {
         Self {
             // trampolines[N]:
             //      ldr pc, [pc, #24]   ; targets + N * 4
-            _trampolines: [0xe59ff018; 8],
+            _trampolines: [0xe59ff018; _],
             // trampolines[N]
             _targets: [
                 unhandled_exception_handler,

src/r3_test_runner/src/main.rs

@@ -1,4 +1,5 @@
 #![feature(exhaustive_patterns)]
+#![feature(generic_arg_infer)]
 #![feature(must_not_suspend)] // `must_not_suspend` lint
 #![feature(decl_macro)] // `macro`
 #![feature(let_else)] // `let ... = ... else { ... }`

src/r3_test_runner/src/targets/probe_rs.rs

@@ -322,7 +322,7 @@ impl ReadRtt {
         Self {
             options,
             st: ReadRttSt::Idle {
-                buf: Box::new([0u8; 1024]),
+                buf: Box::new([0u8; _]),
                 session,
                 rtt: Box::new(rtt),
                 pos: 0,

src/r3_test_runner/src/targets/rp_pico.rs

@@ -514,7 +514,7 @@ impl PicobootCmd {
                 _addr_size: PicobootCmdArgsAddrSize {
                     _addr: addr,
                     _size: size,
-                    _pad: [0; 8],
+                    _pad: [0; _],
                 },
             },
         }
@@ -534,7 +534,7 @@ impl PicobootCmd {
                     _pc: pc,
                     _sp: sp,
                     _delay_ms: delay_ms,
-                    _pad: [0; 4],
+                    _pad: [0; _],
                 },
             },
         }