From: Ian Jackson Date: Wed, 24 Mar 2021 12:52:47 +0000 (+0000) Subject: hidden: Make fallible and fallback X-Git-Tag: otter-0.5.0~466 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a234ea79ff9de8d9f486351d0e9da13e47aad74e;p=otter.git hidden: Make fallible and fallback Signed-off-by: Ian Jackson --- diff --git a/src/hidden.rs b/src/hidden.rs index e83934aa..056e6d55 100644 --- a/src/hidden.rs +++ b/src/hidden.rs @@ -243,12 +243,14 @@ impl OccDisplacement { fn place(&self, _ppiece_use_size: Pos, notch: NotchNumber) -> Pos { use OccDisplacement as OD; match self { - OD::Rect{area} => { + OD::Rect{area} => (|| Some({ let x: Coord = (notch % 3).try_into().unwrap(); // xxx let pos = (area.0[0] + PosC([x*4, 0])).unwrap(); // xxx let pos = (pos + PosC([5,5])).unwrap(); // xxx pos - }, + }))().unwrap_or_else(||{ + area.middle() + }) } } }