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 f5ab2e9cd1506c0510558cd2eb84f475970321bf..d2b839e8d97d7d66f67c031786f43e408d072b40 100644 (file)
--- 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