From: Ian Jackson Date: Sun, 28 Feb 2021 21:29:24 +0000 (+0000) Subject: hidden: Clarify using some whitespace X-Git-Tag: otter-0.4.0~263 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a5751ef58a7667472bf85eb6ab98d5f494adc0b7;p=otter.git hidden: Clarify using some whitespace Signed-off-by: Ian Jackson --- diff --git a/src/hidden.rs b/src/hidden.rs index 546d5c39..4c575ee1 100644 --- a/src/hidden.rs +++ b/src/hidden.rs @@ -268,6 +268,7 @@ fn recalculate_occultation_general< struct Occulted<'o> { occid: OccId, occ: &'o Occultation } let occulteds: OldNew> = [ + gpc.occult.passive.map(|occid| Ok::<_,IE>( Occulted { occid, @@ -275,6 +276,7 @@ fn recalculate_occultation_general< || internal_logic_error("uccultation vanished"))?, } )).transpose()?, + goccults.occults.iter().find_map(|(occid, occ)| { dbg!(if gpc.occult.active.is_some() { // xxx remove dbg! // prevent occulting pieces being occulted @@ -286,6 +288,7 @@ fn recalculate_occultation_general< None }) }), + ].into(); let occids = occulteds.map(|h| h.as_ref().map(|occ| occ.occid));