Merge branch '🚨-clippy' into 🦆

Author: yvt

src/r3/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- **Breaking:** Remove unused lifetime parameters from `r3::sync::{recursive_,}mutex::Definer::wrap_hunk_unchedked`
+
 ## [0.2.4] - 2022-11-16
 
 ### Changed

src/r3/src/lib.rs

@@ -3,6 +3,7 @@
 #![feature(type_alias_impl_trait)]
 #![feature(const_trait_impl)]
 #![feature(const_mut_refs)]
+#![feature(lint_reasons)]
 #![feature(cell_update)]
 #![feature(decl_macro)]
 #![feature(doc_cfg)]

src/r3/src/sync/source.rs

@@ -353,6 +353,7 @@ macro_rules! impl_source_setter {
             )?
             ///
             /// [Take]: crate::bind::Bind::take_mut
+            #[expect(clippy::needless_lifetimes)] // `'pool`
             pub const fn take_bind<'pool>(
                 self,
                 bind: __pr::Bind<'pool, System, AutoWrapped<T>>,
@@ -387,7 +388,7 @@ macro_rules! impl_source_setter {
             /// `UnsafeCell`'s contents based on the assumption that no accesses
             /// are made through other means, and that `T` is initialized by
             /// the time the boot phase completes.
-            pub const unsafe fn wrap_hunk_unchecked<'pool>(
+            pub const unsafe fn wrap_hunk_unchecked(
                 self,
                 hunk: __pr::Hunk<System, __pr::UnsafeCell<__pr::MaybeUninit<AutoWrapped<T>>>>,
             ) -> Definer!(__pr::HunkSource<System, AutoWrapped<T>>)

src/r3_core/src/bind.rs

@@ -1778,6 +1778,9 @@ where
 
     fn register_dependency(&self, ctx: &mut CfgBindCtx<'_>) {
         // `[T]::iter` is unusable in `const fn` [ref:const_slice_iter]
+        // FIXME: `needless_range_loop` false positive
+        // <https://github.com/rust-lang/rust-clippy/issues/10524>
+        #[expect(clippy::needless_range_loop)]
         for i in 0..LEN {
             self[i].register_dependency(ctx);
         }
@@ -1789,6 +1792,9 @@ where
             let mut out = MaybeUninit::uninit_array();
             let this = MaybeUninit::new(self);
             // `[T]::iter_mut` is unusable in `const fn` [ref:const_slice_iter]
+            // FIXME: `needless_range_loop` false positive
+            // <https://github.com/rust-lang/rust-clippy/issues/10524>
+            #[expect(clippy::needless_range_loop)]
             for i in 0..LEN {
                 out[i] = MaybeUninit::new(
                     this.as_ptr()

src/r3_core/src/bind/sorter.rs

@@ -167,6 +167,9 @@ pub(super) const fn sort_bindings<Callback, SorterUseInfoList, VertexList>(
         let mut num_indefinite_exclusive = 0;
 
         // `[T]::iter` is unusable in `const fn` [ref:const_slice_iter]
+        // FIXME: `needless_range_loop` false positive
+        // <https://github.com/rust-lang/rust-clippy/issues/10524>
+        #[expect(clippy::needless_range_loop)]
         for i in 0..bind_users.len() {
             // Reject impossible combinations that should be caught earlier
             match bind_users[i] {
@@ -610,33 +613,22 @@ where
 
     // Calculate `TopologicalSortVertexInfo::num_predecessors`
     let mut num_vertices_remaining = 0;
-    {
-        let mut it_vertices = graph.vertices();
-        while let Some(v) = it_vertices.next() {
-            temp_vertex_info[&v] = TopologicalSortVertexInfo {
-                num_predecessors: 0,
-            };
-            num_vertices_remaining += 1;
-        }
+    for v in graph.vertices() {
+        temp_vertex_info[&v] = TopologicalSortVertexInfo {
+            num_predecessors: 0,
+        };
+        num_vertices_remaining += 1;
     }
-    {
-        let mut it_vertices = graph.vertices();
-        while let Some(v) = it_vertices.next() {
-            let mut it_successors = graph.successors(&v);
-            while let Some(successor) = it_successors.next() {
-                temp_vertex_info[&successor].num_predecessors += 1;
-            }
+    for v in graph.vertices() {
+        for successor in graph.successors(&v) {
+            temp_vertex_info[&successor].num_predecessors += 1;
         }
     }
 
     // Push predecessor-less vertices to `temp_ready_vertex_queue`
-    {
-        let mut it_vertices = graph.vertices();
-        while let Some(v) = it_vertices.next() {
-            if temp_vertex_info[&v].num_predecessors == 0 {
-                temp_ready_vertex_queue
-                    .heap_push(v, ReadyVertexQueueBinaryHeapCtx { vertex_ord_lt });
-            }
+    for v in graph.vertices() {
+        if temp_vertex_info[&v].num_predecessors == 0 {
+            temp_ready_vertex_queue.heap_push(v, ReadyVertexQueueBinaryHeapCtx { vertex_ord_lt });
         }
     }
 
@@ -645,8 +637,7 @@ where
     {
         // Remove `v` from the graph, and push the now-predecessor-less
         // vertices to `temp_ready_vertex_queue`
-        let mut it_successors = graph.successors(&v);
-        while let Some(successor) = it_successors.next() {
+        for successor in graph.successors(&v) {
             temp_vertex_info[&successor].num_predecessors -= 1;
             if temp_vertex_info[&successor].num_predecessors == 0 {
                 temp_ready_vertex_queue

src/r3_core/src/kernel/interrupt.rs

@@ -443,6 +443,9 @@ pub(super) const fn panic_if_unmanaged_safety_is_violated<System: raw::KernelInt
         let is_line_assumed_managed = 'a: {
             let lines = System::RAW_MANAGED_INTERRUPT_LINES;
             // `[T]::iter` is unusable in `const fn` [ref:const_slice_iter]
+            // FIXME: `needless_range_loop` false positive
+            // <https://github.com/rust-lang/rust-clippy/issues/10524>
+            #[expect(clippy::needless_range_loop)]
             for i in 0..lines.len() {
                 if lines[i] == handler.line {
                     break 'a true;
@@ -696,6 +699,9 @@ pub const unsafe fn new_interrupt_handler_table<
 pub const fn num_required_interrupt_line_slots(handlers: &[CfgInterruptHandler]) -> usize {
     // `[T]::iter` is unusable in `const fn` [ref:const_slice_iter]
     let mut out = 0;
+    // FIXME: `needless_range_loop` false positive
+    // <https://github.com/rust-lang/rust-clippy/issues/10524>
+    #[expect(clippy::needless_range_loop)]
     for i in 0..handlers.len() {
         if handlers[i].line + 1 > out {
             out = handlers[i].line + 1;

src/r3_core/src/kernel/raw.rs

@@ -270,6 +270,9 @@ impl QueueOrder {
 
         // `[T]::iter` is unusable in `const fn` [ref:const_slice_iter]
         let values = System::RAW_SUPPORTED_QUEUE_ORDERS;
+        // FIXME: `needless_range_loop` false positive
+        // <https://github.com/rust-lang/rust-clippy/issues/10524>
+        #[expect(clippy::needless_range_loop)]
         for i in 0..values.len() {
             // `#[derive(PartialEq)]` doesn't derive `const PartialEq`
             // [ref:derive_const_partial_eq]
@@ -537,6 +540,9 @@ impl MutexProtocol {
 
         // `[T]::iter` is unusable in `const fn` [ref:const_slice_iter]
         let values = System::RAW_SUPPORTED_MUTEX_PROTOCOLS;
+        // FIXME: `needless_range_loop` false positive
+        // <https://github.com/rust-lang/rust-clippy/issues/10524>
+        #[expect(clippy::needless_range_loop)]
         for i in 0..values.len() {
             // `#[derive(PartialEq)]` doesn't derive `const PartialEq`
             // [ref:derive_const_partial_eq]

src/r3_core/src/lib.rs

@@ -39,6 +39,7 @@
 #![feature(set_ptr_value)] // `<*const T>::set_ptr_value`
 #![feature(slice_ptr_len)]
 #![feature(const_option)]
+#![feature(lint_reasons)]
 #![feature(cell_update)]
 #![feature(const_deref)]
 #![feature(const_heap)]

src/r3_core/src/utils/init.rs

@@ -39,6 +39,9 @@ impl<T: Init, const LEN: usize> Init for [T; LEN] {
         let mut array = mem::MaybeUninit::uninit_array();
 
         // `[T]::iter` is unusable in `const fn` [ref:const_slice_iter]
+        // FIXME: `needless_range_loop` false positive
+        // <https://github.com/rust-lang/rust-clippy/issues/10524>
+        #[expect(clippy::needless_range_loop)]
         for i in 0..LEN {
             array[i] = mem::MaybeUninit::new(T::INIT);
         }

src/r3_kernel/src/event_group.rs

@@ -28,8 +28,7 @@ impl<Traits: KernelTraits> System<Traits> {
     unsafe fn event_group_cb(
         this: EventGroupId,
     ) -> Result<&'static EventGroupCb<Traits>, NoAccessError> {
-        Traits::get_event_group_cb(this.get() - 1)
-            .ok_or_else(|| unsafe { crate::bad_id::<Traits>() })
+        Traits::get_event_group_cb(this.get() - 1).ok_or_else(|| unsafe { crate::bad_id() })
     }
 }