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 fc89c24648552e98cb579448798b71fb139b32a9..c9cd9ff651fcb5359bf9d88db925a2a7f4d0d8df 100644 (file)
--- 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 => {},