From 64efc6dec8d8b6a006a0d58f02e387451a5061d3 Mon Sep 17 00:00:00 2001 From: Frank O'Hara Date: Tue, 14 Jul 2026 08:53:48 -0600 Subject: [PATCH] Fix CI: clippy 1.97 question_mark lint and crossbeam-epoch advisory The Lint job (rustc 1.97 stable) flagged clippy::question_mark on two manual Option-early-return matches in path_utils; collapse each to the ? operator. The Security Audit job failed on RUSTSEC-2026-0204 in the transitive crossbeam-epoch 0.9.18; update it to 0.9.20 (patched). Co-Authored-By: Claude Opus 4.8 (1M context) --- Cargo.lock | 4 ++-- crates/lash-types/src/path_utils.rs | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b067fd..df2982e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -465,9 +465,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f" dependencies = [ "crossbeam-utils", ] diff --git a/crates/lash-types/src/path_utils.rs b/crates/lash-types/src/path_utils.rs index ccd1ec7..1b15ff9 100644 --- a/crates/lash-types/src/path_utils.rs +++ b/crates/lash-types/src/path_utils.rs @@ -34,10 +34,7 @@ pub fn find_git_root(start_dir: &Path) -> Option { if current.join(".git").exists() { return Some(current); } - match current.parent() { - Some(parent) => current = parent.to_path_buf(), - None => return None, - } + current = current.parent()?.to_path_buf(); } } @@ -98,10 +95,7 @@ pub fn find_project_root_from(start_dir: &Path) -> Option { return None; } } - match current.parent() { - Some(parent) => current = parent.to_path_buf(), - None => return None, - } + current = current.parent()?.to_path_buf(); } }