From 2f6f078b6fd7bdc23688ead55a055d825a23b863 Mon Sep 17 00:00:00 2001
From: Kunshan Wang <wks1986@gmail.com>
Date: Tue, 14 Jan 2025 21:03:49 +0800
Subject: [PATCH] Fix Clippy warning in 1.84.0 (#1262)

Rust 1.84.0 added a new lint "unnecessary_map_or". We use
`Option::is_some_and` (introduced in Rust 1.70.0) as suggested by the
lint.
---
 src/plan/generational/global.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plan/generational/global.rs b/src/plan/generational/global.rs
index 91f6f7e911..8e31800b09 100644
--- a/src/plan/generational/global.rs
+++ b/src/plan/generational/global.rs
@@ -117,9 +117,8 @@ impl<VM: VMBinding> CommonGenPlan<VM> {
         // Is the GC triggered by nursery?
         // - if space is none, it is not. Return false immediately.
         // - if space is some, we further check its descriptor.
-        let is_triggered_by_nursery = space.map_or(false, |s| {
-            s.0.common().descriptor == self.nursery.common().descriptor
-        });
+        let is_triggered_by_nursery =
+            space.is_some_and(|s| s.0.common().descriptor == self.nursery.common().descriptor);
         // If space is full and the GC is not triggered by nursery, next GC will be full heap GC.
         if space_full && !is_triggered_by_nursery {
             self.next_gc_full_heap.store(true, Ordering::SeqCst);
@@ -341,5 +340,5 @@ pub trait GenerationalPlanExt<VM: VMBinding>: GenerationalPlan<VM = VM> {
 /// with any plan (generational or not). For non generational plans, it will always return false.
 pub fn is_nursery_gc<VM: VMBinding>(plan: &dyn Plan<VM = VM>) -> bool {
     plan.generational()
-        .map_or(false, |plan| plan.is_current_gc_nursery())
+        .is_some_and(|plan| plan.is_current_gc_nursery())
 }