Use Void, not our own

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

diff --git a/src/prelude.rs b/src/prelude.rs
index c1ce3290371c91e44124114e1415b4e7bb9bc53b..24eb944301e6158b1fb39ca0cc8c8545532ee42a 100644 (file)
--- 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 830f3bb2e22305fac55d3ad0f6ae27fd217986da..9a35845e017e23d08b9d10dd989c3106b17ccb48 100644 (file)
--- 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>