Disable is_some_and feature

Author: mkroening

src/lib.rs

@@ -14,7 +14,6 @@
 #![feature(naked_functions)]
 #![feature(specialization)]
 #![feature(strict_provenance)]
-#![feature(is_some_and)]
 #![cfg_attr(target_os = "none", no_std)]
 #![cfg_attr(target_os = "none", feature(custom_test_frameworks))]
 #![cfg_attr(all(target_os = "none", test), test_runner(crate::test_runner))]

src/scheduler/task.rs

@@ -168,9 +168,8 @@ impl TaskHandlePriorityQueue {
 	/// Checks if the given task is in the queue. Returns `true` if the task
 	/// was found.
 	pub fn contains(&self, task: TaskHandle) -> bool {
-		self.queues[task.priority.into() as usize]
-			.as_ref()
-			.is_some_and(|queue| queue.iter().any(|queued| queued.id == task.id))
+		matches!(self.queues[task.priority.into() as usize]
+			.as_ref(), Some(queue) if queue.iter().any(|queued| queued.id == task.id))
 	}
 
 	/// Add a task handle by its priority to the queue

src/synch/futex.rs

@@ -56,7 +56,7 @@ pub fn futex_wait(address: &AtomicU32, expected: u32, timeout: Option<u64>, flag
 		scheduler.reschedule();
 
 		let mut parking_lot = PARKING_LOT.lock();
-		if wakeup_time.is_some_and(|t| t <= get_timer_ticks()) {
+		if matches!(wakeup_time, Some(t) if t <= get_timer_ticks()) {
 			let mut wakeup = true;
 			// Timeout occurred, try to remove ourselves from the waiting queue.
 			if let Entry::Occupied(mut queue) = parking_lot.entry(addr(address)) {
@@ -74,9 +74,8 @@ pub fn futex_wait(address: &AtomicU32, expected: u32, timeout: Option<u64>, flag
 			}
 		} else {
 			// If we are not in the waking queue, this must have been a wakeup.
-			let wakeup = !parking_lot
-				.get(&addr(address))
-				.is_some_and(|queue| queue.contains(handle));
+			let wakeup = !matches!(parking_lot
+				.get(&addr(address)), Some(queue) if queue.contains(handle));
 
 			if wakeup {
 				return 0;