From dac3133b1505bcfe22d73095057e0c59881792b1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Apr 2021 23:38:54 +0100
Subject: [PATCH] PosOffTableError: Use in organise

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/organise.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 => {},
-- 
2.30.2