From 30d31822c114cd3d505eb0b47b1c9cf87c41baf3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Apr 2021 11:33:00 +0100
Subject: [PATCH] Use Void, not our own

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/prelude.rs | 2 +-
 src/updates.rs | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/prelude.rs b/src/prelude.rs
index c1ce3290..24eb9443 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -95,7 +95,7 @@ pub use strum::{IntoEnumIterator, IntoStaticStr};
 pub use thiserror::Error;
 pub use url::Url;
 pub use vecdeque_stableix::Deque as StableIndexVecDeque;
-pub use void::Void;
+pub use void::{Void, ResultVoidExt, ResultVoidErrExt};
 
 use nix::time::ClockId;
 pub const CLOCK_REALTIME : ClockId = ClockId::CLOCK_REALTIME ;
diff --git a/src/updates.rs b/src/updates.rs
index 830f3bb2..9a35845e 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -501,12 +501,10 @@ impl<NS,ZC> PieceUpdateOp<NS,ZC> {
              G: FnOnce(ZC) -> ZC2
              > (self, f:F, g:G) -> PieceUpdateOp<NS2,ZC2>
   {
-    #[derive(Error,Debug)]
-    enum Never { }
     self.try_map(
-      |ns| <Result<_,Never>>::Ok(f(ns)),
-      |zc| <Result<_,Never>>::Ok(g(zc)),
-    ).unwrap()
+      |ns| <Result<_,Void>>::Ok(f(ns)),
+      |zc| <Result<_,Void>>::Ok(g(zc)),
+    ).void_unwrap()
   }
   pub fn new_z_generation(&self) -> Option<Generation>
     where ZC: Borrow<ZLevel>
-- 
2.30.2