tock · alevy · Jun 19, 2024 · Jun 17, 2024
diff --git a/kernel/src/collections/queue.rs b/kernel/src/collections/queue.rs
@@ -25,7 +25,7 @@ pub trait Queue<T> {
     fn dequeue(&mut self) -> Option<T>;
 
     /// Remove and return one (the first) element that matches the predicate.
-    fn remove_first<F>(&mut self, f: F) -> Option<T>
+    fn remove_first_matching<F>(&mut self, f: F) -> Option<T>
     where
         F: Fn(&T) -> bool;
 

diff --git a/kernel/src/collections/ring_buffer.rs b/kernel/src/collections/ring_buffer.rs
@@ -111,7 +111,14 @@ impl<T: Copy> queue::Queue<T> for RingBuffer<'_, T> {
         }
     }
 
-    fn remove_first<F>(&mut self, f: F) -> Option<T>
+    /// Removes the first element for which the provided closure returns `true`.
+    ///
+    /// This walks the ring buffer and, upon finding a matching element, removes
+    /// it. It then shifts all subsequent elements forward (filling the hole
+    /// created by removing the element).
+    ///
+    /// If an element was removed, this function returns it as `Some(elem)`.
+    fn remove_first_matching<F>(&mut self, f: F) -> Option<T>
     where
         F: Fn(&T) -> bool,
     {

diff --git a/kernel/src/process_standard.rs b/kernel/src/process_standard.rs
@@ -461,7 +461,7 @@ impl<C: Chip> Process for ProcessStandard<'_, C> {
 
     fn remove_upcall(&self, upcall_id: UpcallId) -> Option<Task> {
         self.tasks.map_or(None, |tasks| {
-            tasks.remove_first(|task| match task {
+            tasks.remove_first_matching(|task| match task {
                 Task::FunctionCall(fc) => match fc.source {
                     FunctionCallSource::Driver(upid) => upid == upcall_id,
                     _ => false,