From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Apr 2021 22:38:54 +0000 (+0100)
Subject: PosOffTableError: Use in organise
X-Git-Tag: otter-0.6.0~506
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dac3133b1505bcfe22d73095057e0c59881792b1;p=otter.git

PosOffTableError: Use in organise

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/organise.rs b/src/organise.rs
index fc89c246..c9cd9ff6 100644
--- a/src/organise.rs
+++ b/src/organise.rs
@@ -292,9 +292,8 @@ pub fn ui_operation(a: &mut ApiPieceOpArgs<'_>, _: OcculterRotationChecked,
 
   for &pos in &layout {
     // Some sanity checks
-    if pos.clamped(gs.table_size).is_err() {
-      throw!(APOE::ReportViaUpdate(POE::PosOffTable))
-    }
+    pos.clamped(gs.table_size).map_err(
+      |_| APOE::ReportViaUpdate(POE::PosOffTable))?;
     match gs.occults.pos_occulter(&gs.occults, pos)? {
       None => {},
       Some(occulter) if occulter == apiece => {},