From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Apr 2021 12:57:46 +0000 (+0100)
Subject: want: Use new arrangements in hidden
X-Git-Tag: otter-0.5.0~316
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f1021f20f2851618439c74ccd963442d057f04ff;p=otter.git

want: Use new arrangements in hidden

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

diff --git a/src/hidden.rs b/src/hidden.rs
index f5ab2e9c..d2b839e8 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -649,11 +649,11 @@ fn recalculate_occultation_general<
       let occ = occultation(goccults, occid);
       if_chain!{
         if occ.notches.is_empty();
-        if let Some(ilk) = want!( Some = ipc.occilk.as_ref() );
+        if let Some(ilk) = wants!( ipc.occilk.as_ref() );
         let ilk = ilk.borrow();
-        if let Some(ilk) = want!( Some = ioccults.ilks.get(ilk) );
+        if let Some(ilk) = wants!( ioccults.ilks.get(ilk) );
         if let Some(bbox) = want!( Ok = ilk.p_occ.bbox_approx() );
-        if let Some(size) = want!( Ok = bbox.br() - bbox.tl() );
+        if let Some(size) = want!( Ok = bbox.br() - bbox.tl(), ?(bbox) );
         then { occ.ppiece_use_size = size; }
       };
       let notch = occ.notches