Replace void crate with std::convert::Infallible.

deepwell/Cargo.toml

@@ -56,7 +56,6 @@ toml = { version = "0.8", features = ["parse"] }
 typenum = "1"
 unic-langid = "0.9"
 unicase = "2"
-void = "1"
 wikidot-normalize = "0.11"
 wikidot-path = "0.5"
 

deepwell/src/services/blob/mime.rs

@@ -30,9 +30,9 @@
 use super::prelude::*;
 use crossfire::mpsc;
 use filemagic::{FileMagicError, Flags as MagicFlags, Magic};
+use std::convert::Infallible;
 use std::sync::Once;
 use std::{process, thread};
-use void::{ResultVoidErrExt, Void};
 
 type ResponsePayload = StdResult<String, FileMagicError>;
 type ResponseSender = mpsc::TxBlocking<ResponsePayload, mpsc::SharedSenderBRecvF>;
@@ -58,7 +58,7 @@ macro_rules! source {
     };
 }
 
-fn main_loop() -> Result<Void> {
+fn main_loop() -> Result<Infallible> {
     const MAGIC_FLAGS: MagicFlags = MagicFlags::MIME;
     const MAGIC_PATHS: &[&str] = &[]; // Empty indicates using the default magic database
 
@@ -81,11 +81,20 @@ fn main_loop() -> Result<Void> {
 pub fn spawn_magic_thread() {
     static START: Once = Once::new();
 
+    macro_rules! unwrap_err {
+        ($result:expr) => {
+            match $result {
+                Ok(_) => unreachable!(),
+                Err(error) => error,
+            }
+        };
+    }
+
     START.call_once(|| {
         thread::spawn(|| {
             // Since this is an infinite loop, no success case can return.
             // Only the initialization can fail, individual requests just pass back the result.
-            let error = main_loop().void_unwrap_err();
+            let error = unwrap_err!(main_loop());
             tide::log::error!("Failed to spawn magic thread: {error}");
             process::exit(1);
         });

deepwell/src/services/job/service.rs

@@ -24,8 +24,8 @@ use crate::services::{PageRevisionService, SessionService, TextService};
 use async_std::task;
 use crossfire::mpsc;
 use sea_orm::TransactionTrait;
+use std::convert::Infallible;
 use std::sync::Arc;
-use void::Void;
 
 lazy_static! {
     static ref QUEUE: (mpsc::TxUnbounded<Job>, mpsc::RxUnbounded<Job>) =
@@ -109,7 +109,7 @@ impl JobRunner {
         //      see config.refill_name_change
     }
 
-    async fn main_loop(mut self) -> Void {
+    async fn main_loop(mut self) -> Infallible {
         tide::log::info!("Starting job runner");
 
         let delay = self.state.config.job_delay;

deepwell/src/services/page_query/service.rs

@@ -28,7 +28,7 @@ use crate::models::page_parent::{self, Entity as PageParent};
 use crate::models::{page_revision, text};
 use crate::services::{PageService, ParentService};
 use sea_query::{Expr, Query};
-use void::Void;
+use std::convert::Infallible;
 
 #[derive(Debug)]
 pub struct PageQueryService;
@@ -68,7 +68,7 @@ impl PageQueryService {
             pagination,
             variables,
         }: PageQuery<'_>,
-    ) -> Result<Void> {
+    ) -> Result<Infallible> {
         tide::log::info!("Building ListPages query from specification");
 
         let txn = ctx.transaction();