fix: Rust 1.95 clippy — match guards + map_or

Rust 1.95 promoted collapsible_match and map_unwrap_or; CI runs
-D warnings so they break the build. Collapse nested `if`s into
match guards across codegen/optimizer/export, and swap
map().unwrap_or(..) for map_or / is_ok_and.

crates/core/src/codegen.rs

@@ -2012,15 +2012,13 @@ fn emit_promoted_op(f: &mut Function, op: &IrOp, sim: &mut StackSim) {
             // Outside loops, RFetch shouldn't appear in promoted code
         }
 
-        IrOp::LoopJ => {
+        IrOp::LoopJ if sim.loop_index_stack.len() >= 2 => {
-            if sim.loop_index_stack.len() >= 2 {
             let (outer_index, _) = sim.loop_index_stack[sim.loop_index_stack.len() - 2];
             let result = sim.alloc();
             f.instruction(&Instruction::LocalGet(outer_index));
             f.instruction(&Instruction::LocalSet(result));
             sim.push(result);
         }
-        }
 
         IrOp::Exit => {
             // Write remaining promoted locals back to memory stack, then return
@@ -2147,16 +2145,16 @@ fn needs_f64_locals(ops: &[IrOp]) -> bool {
                     return true;
                 }
             }
-            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body } => {
+            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body }
-                if needs_f64_locals(body) {
+                if needs_f64_locals(body) =>
+            {
                 return true;
             }
-            }
+            IrOp::BeginWhileRepeat { test, body }
-            IrOp::BeginWhileRepeat { test, body } => {
+                if needs_f64_locals(test) || needs_f64_locals(body) =>
-                if needs_f64_locals(test) || needs_f64_locals(body) {
+            {
                 return true;
             }
-            }
             IrOp::BeginDoubleWhileRepeat {
                 outer_test,
                 inner_test,
@@ -2209,16 +2207,16 @@ fn body_needs_return_stack(ops: &[IrOp]) -> bool {
                     return true;
                 }
             }
-            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body } => {
+            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body }
-                if body_needs_return_stack(body) {
+                if body_needs_return_stack(body) =>
+            {
                 return true;
             }
-            }
+            IrOp::BeginWhileRepeat { test, body }
-            IrOp::BeginWhileRepeat { test, body } => {
+                if body_needs_return_stack(test) || body_needs_return_stack(body) =>
-                if body_needs_return_stack(test) || body_needs_return_stack(body) {
+            {
                 return true;
             }
-            }
             IrOp::BeginDoubleWhileRepeat {
                 outer_test,
                 inner_test,

crates/core/src/export.rs

@@ -131,11 +131,9 @@ pub fn export_module(
 fn collect_external_calls(ops: &[IrOp], ir_ids: &HashSet<WordId>, host_ids: &mut HashSet<WordId>) {
     for op in ops {
         match op {
-            IrOp::Call(id) | IrOp::TailCall(id) => {
+            IrOp::Call(id) | IrOp::TailCall(id) if !ir_ids.contains(id) => {
-                if !ir_ids.contains(id) {
                 host_ids.insert(*id);
             }
-            }
             IrOp::If {
                 then_body,
                 else_body,

crates/core/src/optimizer.rs

@@ -591,16 +591,16 @@ fn contains_call_to(ops: &[IrOp], target: WordId) -> bool {
                     return true;
                 }
             }
-            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body } => {
+            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body }
-                if contains_call_to(body, target) {
+                if contains_call_to(body, target) =>
+            {
                 return true;
             }
-            }
+            IrOp::BeginWhileRepeat { test, body }
-            IrOp::BeginWhileRepeat { test, body } => {
+                if contains_call_to(test, target) || contains_call_to(body, target) =>
-                if contains_call_to(test, target) || contains_call_to(body, target) {
+            {
                 return true;
             }
-            }
             IrOp::BeginDoubleWhileRepeat {
                 outer_test,
                 inner_test,
@@ -651,16 +651,14 @@ fn contains_exit(ops: &[IrOp]) -> bool {
                     return true;
                 }
             }
-            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body } => {
+            IrOp::DoLoop { body, .. } | IrOp::BeginUntil { body } | IrOp::BeginAgain { body }
-                if contains_exit(body) {
+                if contains_exit(body) =>
+            {
                 return true;
             }
-            }
+            IrOp::BeginWhileRepeat { test, body } if contains_exit(test) || contains_exit(body) => {
-            IrOp::BeginWhileRepeat { test, body } => {
-                if contains_exit(test) || contains_exit(body) {
                 return true;
             }
-            }
             _ => {}
         }
     }

crates/core/src/outer.rs

@@ -397,8 +397,7 @@ impl<R: Runtime> ForthVM<R> {
                 use std::time::{SystemTime, UNIX_EPOCH};
                 let seed = SystemTime::now()
                     .duration_since(UNIX_EPOCH)
-                    .map(|d| d.as_nanos() as u64)
+                    .map_or(0xDEAD_BEEF_CAFE_BABE, |d| d.as_nanos() as u64);
-                    .unwrap_or(0xDEAD_BEEF_CAFE_BABE);
                 Arc::new(Mutex::new(if seed == 0 {
                     0xDEAD_BEEF_CAFE_BABE
                 } else {

crates/core/tests/comparison.rs

@@ -26,8 +26,7 @@ fn probe_gforth(candidate: &str) -> bool {
         .arg("-e")
         .arg("bye")
         .output()
-        .map(|o| o.status.success())
+        .is_ok_and(|o| o.status.success())
-        .unwrap_or(false)
 }
 
 fn find_gforth() -> Option<&'static str> {