From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Apr 2021 12:43:10 +0000 (+0100)
Subject: want: Use a few more times
X-Git-Tag: otter-0.5.0~320
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=64c2aa9a4f760dc2c1af5e683049c87980438203;p=otter.git

want: Use a few more times

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

diff --git a/src/hidden.rs b/src/hidden.rs
index c4c56741..f5ab2e9c 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -651,9 +651,9 @@ fn recalculate_occultation_general<
         if occ.notches.is_empty();
         if let Some(ilk) = want!( Some = ipc.occilk.as_ref() );
         let ilk = ilk.borrow();
-        if let Some(ilk) = ioccults.ilks.get(ilk);         // expected, really
-        if let Ok::<_,IE>(bbox) = ilk.p_occ.bbox_approx(); // expected, really
-        if let Ok(size) = bbox.br() - bbox.tl();           // expected, really
+        if let Some(ilk) = want!( Some = 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() );
         then { occ.ppiece_use_size = size; }
       };
       let notch = occ.notches