From 6995e0c42308b9adfccee7ff9bace80e29c458db Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 4 Oct 2026 14:31:37 -0400 Subject: [PATCH] Never crash: interactive tools (tools) Removes every production unwrap/expect/unreachable from the tools crate and denies the panic lints there: ARAP mesh band/seed selection, liquify dabs, the anchor-point tool's drag preview (an idle drag now does nothing) and the type tool's typing session. Co-Authored-By: Claude Opus 5.5 --- clippy.toml | 4 ++++ crates/tools/src/distort/arap.rs | 12 ++++++++---- crates/tools/src/distort/liquify.rs | 2 +- crates/tools/src/draw2/anchor.rs | 14 ++++++++------ crates/tools/src/lib.rs | 1 + crates/tools/src/text.rs | 3 +-- crates/tools/src/xform/gradient.rs | 5 +++-- 7 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 clippy.toml diff --git a/clippy.toml b/clippy.toml new file mode 100644 index 00000000..4b6c79f5 --- /dev/null +++ b/clippy.toml @@ -0,0 +1,4 @@ +allow-unwrap-in-tests = true +allow-expect-in-tests = true +allow-panic-in-tests = true +allow-indexing-slicing-in-tests = true diff --git a/crates/tools/src/distort/arap.rs b/crates/tools/src/distort/arap.rs index fbe8bbf4..f2c224a7 100644 --- a/crates/tools/src/distort/arap.rs +++ b/crates/tools/src/distort/arap.rs @@ -204,7 +204,7 @@ impl Mesh { /// Band width (in vertices) of the vertex adjacency. fn vertex_band(&self) -> usize { - self.tris.iter().map(|t| t.iter().max().unwrap() - t.iter().min().unwrap()).max().unwrap_or(0) + self.tris.iter().filter_map(|t| Some(t.iter().max()? - t.iter().min()?)).max().unwrap_or(0) } /// The triangle and barycentric coordinates of `p` (extrapolated from the nearest mesh cell @@ -448,10 +448,12 @@ pub fn auto_pins(mesh: &Mesh, count: usize) -> Vec { return vec![]; } let c = centres.iter().fold(Vec2::ZERO, |a, p| a + p.to_vec2()) / centres.len() as f64; - let first = *centres.iter().min_by(|a, b| a.distance_squared(c.to_point()).total_cmp(&b.distance_squared(c.to_point()))).unwrap(); + let Some(&first) = centres.iter().min_by(|a, b| a.distance_squared(c.to_point()).total_cmp(&b.distance_squared(c.to_point()))) else { + return vec![]; + }; let mut out = vec![first]; while out.len() < count.min(centres.len()) { - let next = centres + let Some(next) = centres .iter() .max_by(|a, b| { let da = out.iter().map(|o| o.distance_squared(**a)).fold(f64::MAX, f64::min); @@ -459,7 +461,9 @@ pub fn auto_pins(mesh: &Mesh, count: usize) -> Vec { da.total_cmp(&db) }) .copied() - .unwrap(); + else { + break; + }; out.push(next); } out diff --git a/crates/tools/src/distort/liquify.rs b/crates/tools/src/distort/liquify.rs index a56d5f26..19b80f4c 100644 --- a/crates/tools/src/distort/liquify.rs +++ b/crates/tools/src/distort/liquify.rs @@ -218,7 +218,7 @@ pub fn dabs(points: &[Point], spacing: f64) -> Vec { break; } } - let end = *points.last().unwrap(); + let Some(&end) = points.last() else { return out }; if end.distance(last) > spacing * 0.25 { out.push(end); } diff --git a/crates/tools/src/draw2/anchor.rs b/crates/tools/src/draw2/anchor.rs index 5533b1df..6a2f2db1 100644 --- a/crates/tools/src/draw2/anchor.rs +++ b/crates/tools/src/draw2/anchor.rs @@ -128,10 +128,11 @@ impl Tool for AnchorTool { *began = true; } } - out.push(match self.state { - State::Convert { id, si, ai, .. } => { - Action::Preview("path.convertAnchor".into(), json!({"id": id.0, "subpath": si, "anchor": ai, "to": "smooth", "x": p.x, "y": p.y})) - } + let preview = match self.state { + State::Convert { id, si, ai, .. } => Action::Preview( + "path.convertAnchor".into(), + json!({"id": id.0, "subpath": si, "anchor": ai, "to": "smooth", "x": p.x, "y": p.y}), + ), State::Handle { id, si, ai, out, .. } => Action::Preview( "path.setHandle".into(), json!({"id": id.0, "subpath": si, "anchor": ai, "which": if out { "out" } else { "in" }, "x": p.x, "y": p.y, "independent": true}), @@ -140,8 +141,9 @@ impl Tool for AnchorTool { "path.reshapeSegment".into(), json!({"id": id.0, "subpath": si, "segment": seg, "t": t, "dx": p.x - start.x, "dy": p.y - start.y}), ), - State::Idle => unreachable!(), - }); + State::Idle => return out, + }; + out.push(preview); out } ("anchorPoint", PointerKind::Up) => { diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index ebfa4808..c66b5093 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs @@ -6,6 +6,7 @@ //! and journal entry. One-shot `Exec` actions run immediately. This makes every gesture replayable //! by the control channel and MCP, and keeps tools testable without a UI. #![forbid(unsafe_code)] +#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)] pub mod bbox; pub mod builder; diff --git a/crates/tools/src/text.rs b/crates/tools/src/text.rs index 8ef68732..c48ca408 100644 --- a/crates/tools/src/text.rs +++ b/crates/tools/src/text.rs @@ -137,9 +137,8 @@ impl TypeTool { } if self.typing.is_none() { out.push(Action::Begin("Typing".into())); - self.typing = Some(Typing { base: t.runs.clone(), cur: t.runs.clone() }); } - let ty = self.typing.as_mut().expect("typing session"); + let ty = self.typing.get_or_insert_with(|| Typing { base: t.runs.clone(), cur: t.runs.clone() }); let len = edit::runs_len(&ty.cur); let (a, b) = (self.caret.min(self.anchor).min(len), self.caret.max(self.anchor).min(len)); let caret = match &styled { diff --git a/crates/tools/src/xform/gradient.rs b/crates/tools/src/xform/gradient.rs index b1996922..068868a0 100644 --- a/crates/tools/src/xform/gradient.rs +++ b/crates/tools/src/xform/gradient.rs @@ -401,8 +401,9 @@ impl Tool for GradientTool { } (PointerKind::Drag, Some(g)) => return freeform::drag(cx, g, ev.pos), (PointerKind::Up, Some(_)) => { - let g = self.free.take().expect("checked"); - return freeform::release(cx, FreeformAnnotator::of(cx).as_ref(), g); + if let Some(g) = self.free.take() { + return freeform::release(cx, FreeformAnnotator::of(cx).as_ref(), g); + } } (PointerKind::DoubleClick, free) if free.is_some() || FreeformAnnotator::of(cx).is_some() => return vec![], _ => {}