From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Mar 2021 19:30:56 +0000 (+0000)
Subject: hidden: use Once
X-Git-Tag: otter-0.4.0~150
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cea666750bd234d1d040a9b0a10d872acb7fccf4;p=otter.git

hidden: use Once

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

diff --git a/src/hidden.rs b/src/hidden.rs
index cc469717..15e54992 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -860,16 +860,16 @@ mod recompute {
                      gpieces: &mut GPieces,
                      goccults: &mut GameOccults,
                      ipieces: &IPieces) -> Implemented {
-      struct GenIncr<'g> { gen: &'g mut Generation, none_yet: Option<()>, }
+      struct GenIncr<'g> { gen: &'g mut Generation, none_yet: iter::Once<()>, }
       impl GenIncr<'_> {
         fn next(&mut self) -> Generation {
-          if self.none_yet.take().is_some() { self.gen.increment() }
+          if self.none_yet.next().is_some() { self.gen.increment() }
           let r = *self.gen;
           self.gen.increment();
           r
         }
       }
-      let mut gen = GenIncr { gen, none_yet: Some(()) };
+      let mut gen = GenIncr { gen, none_yet: iter::once(()) };
 
       for occid in self.outdated {
         if let Some(occ) = goccults.occults.get_mut(occid) {