Replace Void with never type

CDirkx · CDirkx · commit 389fef3b304b · 2021-04-20T20:53:07.000+02:00
diff --git a/library/std/src/sys/hermit/fs.rs b/library/std/src/sys/hermit/fs.rs
@@ -9,7 +9,7 @@ use crate::sys::hermit::abi;
 use crate::sys::hermit::abi::{O_APPEND, O_CREAT, O_EXCL, O_RDONLY, O_RDWR, O_TRUNC, O_WRONLY};
 use crate::sys::hermit::fd::FileDesc;
 use crate::sys::time::SystemTime;
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::sys_common::os_str_bytes::OsStrExt;
 
 pub use crate::sys_common::fs::copy;
@@ -22,11 +22,11 @@ fn cstr(path: &Path) -> io::Result<CString> {
 #[derive(Debug)]
 pub struct File(FileDesc);
 
-pub struct FileAttr(Void);
+pub struct FileAttr(!);
 
-pub struct ReadDir(Void);
+pub struct ReadDir(!);
 
-pub struct DirEntry(Void);
+pub struct DirEntry(!);
 
 #[derive(Clone, Debug)]
 pub struct OpenOptions {
@@ -41,9 +41,9 @@ pub struct OpenOptions {
     mode: i32,
 }
 
-pub struct FilePermissions(Void);
+pub struct FilePermissions(!);
 
-pub struct FileType(Void);
+pub struct FileType(!);
 
 #[derive(Debug)]
 pub struct DirBuilder {}
diff --git a/library/std/src/sys/hermit/mod.rs b/library/std/src/sys/hermit/mod.rs
@@ -61,11 +61,6 @@ pub fn unsupported_err() -> crate::io::Error {
     )
 }
 
-// This enum is used as the storage for a bunch of types which can't actually
-// exist.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
-pub enum Void {}
-
 pub unsafe fn strlen(start: *const c_char) -> usize {
     let mut str = start;
 
diff --git a/library/std/src/sys/hermit/net.rs b/library/std/src/sys/hermit/net.rs
@@ -6,7 +6,7 @@ use crate::str;
 use crate::sync::Arc;
 use crate::sys::hermit::abi;
 use crate::sys::hermit::abi::IpAddress::{Ipv4, Ipv6};
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::sys_common::AsInner;
 use crate::time::Duration;
 
@@ -411,7 +411,7 @@ impl fmt::Debug for UdpSocket {
     }
 }
 
-pub struct LookupHost(Void);
+pub struct LookupHost(!);
 
 impl LookupHost {
     pub fn port(&self) -> u16 {
diff --git a/library/std/src/sys/hermit/os.rs b/library/std/src/sys/hermit/os.rs
@@ -9,7 +9,7 @@ use crate::path::{self, PathBuf};
 use crate::str;
 use crate::sync::Mutex;
 use crate::sys::hermit::abi;
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::sys_common::os_str_bytes::*;
 use crate::vec;
 
@@ -29,7 +29,7 @@ pub fn chdir(_: &path::Path) -> io::Result<()> {
     unsupported()
 }
 
-pub struct SplitPaths<'a>(&'a Void);
+pub struct SplitPaths<'a>(&'a !);
 
 pub fn split_paths(_unparsed: &OsStr) -> SplitPaths<'_> {
     panic!("unsupported")
diff --git a/library/std/src/sys/sgx/mod.rs b/library/std/src/sys/sgx/mod.rs
@@ -115,11 +115,6 @@ pub fn decode_error_kind(code: i32) -> ErrorKind {
     }
 }
 
-// This enum is used as the storage for a bunch of types which can't actually
-// exist.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
-pub enum Void {}
-
 pub unsafe fn strlen(mut s: *const c_char) -> usize {
     let mut n = 0;
     while unsafe { *s } != 0 {
diff --git a/library/std/src/sys/sgx/net.rs b/library/std/src/sys/sgx/net.rs
@@ -5,7 +5,7 @@ use crate::io::{self, IoSlice, IoSliceMut};
 use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr, ToSocketAddrs};
 use crate::sync::Arc;
 use crate::sys::fd::FileDesc;
-use crate::sys::{sgx_ineffective, unsupported, AsInner, FromInner, IntoInner, TryIntoInner, Void};
+use crate::sys::{sgx_ineffective, unsupported, AsInner, FromInner, IntoInner, TryIntoInner};
 use crate::time::Duration;
 
 use super::abi::usercalls;
@@ -310,7 +310,7 @@ impl FromInner<Socket> for TcpListener {
     }
 }
 
-pub struct UdpSocket(Void);
+pub struct UdpSocket(!);
 
 impl UdpSocket {
     pub fn bind(_: io::Result<&SocketAddr>) -> io::Result<UdpSocket> {
@@ -462,7 +462,7 @@ impl fmt::Display for NonIpSockAddr {
     }
 }
 
-pub struct LookupHost(Void);
+pub struct LookupHost(!);
 
 impl LookupHost {
     fn new(host: String) -> io::Result<LookupHost> {
diff --git a/library/std/src/sys/sgx/os.rs b/library/std/src/sys/sgx/os.rs
@@ -10,7 +10,7 @@ use crate::str;
 use crate::sync::atomic::{AtomicUsize, Ordering};
 use crate::sync::Mutex;
 use crate::sync::Once;
-use crate::sys::{decode_error_kind, sgx_ineffective, unsupported, Void};
+use crate::sys::{decode_error_kind, sgx_ineffective, unsupported};
 use crate::vec;
 
 pub fn errno() -> i32 {
@@ -35,7 +35,7 @@ pub fn chdir(_: &path::Path) -> io::Result<()> {
     sgx_ineffective(())
 }
 
-pub struct SplitPaths<'a>(&'a Void);
+pub struct SplitPaths<'a>(&'a !);
 
 pub fn split_paths(_unparsed: &OsStr) -> SplitPaths<'_> {
     panic!("unsupported")
diff --git a/library/std/src/sys/unsupported/common.rs b/library/std/src/sys/unsupported/common.rs
@@ -36,11 +36,6 @@ pub fn hashmap_random_keys() -> (u64, u64) {
     (1, 2)
 }
 
-// This enum is used as the storage for a bunch of types which can't actually
-// exist.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
-pub enum Void {}
-
 pub unsafe fn strlen(mut s: *const c_char) -> usize {
     // SAFETY: The caller must guarantee `s` points to a valid 0-terminated string.
     unsafe {
diff --git a/library/std/src/sys/unsupported/fs.rs b/library/std/src/sys/unsupported/fs.rs
@@ -4,22 +4,22 @@ use crate::hash::{Hash, Hasher};
 use crate::io::{self, IoSlice, IoSliceMut, SeekFrom};
 use crate::path::{Path, PathBuf};
 use crate::sys::time::SystemTime;
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 
-pub struct File(Void);
+pub struct File(!);
 
-pub struct FileAttr(Void);
+pub struct FileAttr(!);
 
-pub struct ReadDir(Void);
+pub struct ReadDir(!);
 
-pub struct DirEntry(Void);
+pub struct DirEntry(!);
 
 #[derive(Clone, Debug)]
 pub struct OpenOptions {}
 
-pub struct FilePermissions(Void);
+pub struct FilePermissions(!);
 
-pub struct FileType(Void);
+pub struct FileType(!);
 
 #[derive(Debug)]
 pub struct DirBuilder {}
diff --git a/library/std/src/sys/unsupported/net.rs b/library/std/src/sys/unsupported/net.rs
@@ -2,10 +2,10 @@ use crate::convert::TryFrom;
 use crate::fmt;
 use crate::io::{self, IoSlice, IoSliceMut};
 use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr};
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::time::Duration;
 
-pub struct TcpStream(Void);
+pub struct TcpStream(!);
 
 impl TcpStream {
     pub fn connect(_: io::Result<&SocketAddr>) -> io::Result<TcpStream> {
@@ -107,7 +107,7 @@ impl fmt::Debug for TcpStream {
     }
 }
 
-pub struct TcpListener(Void);
+pub struct TcpListener(!);
 
 impl TcpListener {
     pub fn bind(_: io::Result<&SocketAddr>) -> io::Result<TcpListener> {
@@ -157,7 +157,7 @@ impl fmt::Debug for TcpListener {
     }
 }
 
-pub struct UdpSocket(Void);
+pub struct UdpSocket(!);
 
 impl UdpSocket {
     pub fn bind(_: io::Result<&SocketAddr>) -> io::Result<UdpSocket> {
@@ -291,7 +291,7 @@ impl fmt::Debug for UdpSocket {
     }
 }
 
-pub struct LookupHost(Void);
+pub struct LookupHost(!);
 
 impl LookupHost {
     pub fn port(&self) -> u16 {
diff --git a/library/std/src/sys/unsupported/os.rs b/library/std/src/sys/unsupported/os.rs
@@ -1,4 +1,4 @@
-use super::{unsupported, Void};
+use super::unsupported;
 use crate::error::Error as StdError;
 use crate::ffi::{OsStr, OsString};
 use crate::fmt;
@@ -21,7 +21,7 @@ pub fn chdir(_: &path::Path) -> io::Result<()> {
     unsupported()
 }
 
-pub struct SplitPaths<'a>(&'a Void);
+pub struct SplitPaths<'a>(&'a !);
 
 pub fn split_paths(_unparsed: &OsStr) -> SplitPaths<'_> {
     panic!("unsupported")
@@ -62,7 +62,7 @@ pub fn current_exe() -> io::Result<PathBuf> {
     unsupported()
 }
 
-pub struct Env(Void);
+pub struct Env(!);
 
 impl Iterator for Env {
     type Item = (OsString, OsString);
diff --git a/library/std/src/sys/unsupported/pipe.rs b/library/std/src/sys/unsupported/pipe.rs
@@ -1,7 +1,6 @@
 use crate::io::{self, IoSlice, IoSliceMut};
-use crate::sys::Void;
 
-pub struct AnonPipe(Void);
+pub struct AnonPipe(!);
 
 impl AnonPipe {
     pub fn read(&self, _buf: &mut [u8]) -> io::Result<usize> {
diff --git a/library/std/src/sys/unsupported/process.rs b/library/std/src/sys/unsupported/process.rs
@@ -5,7 +5,7 @@ use crate::marker::PhantomData;
 use crate::path::Path;
 use crate::sys::fs::File;
 use crate::sys::pipe::AnonPipe;
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::sys_common::process::{CommandEnv, CommandEnvs};
 
 pub use crate::ffi::OsString as EnvKey;
@@ -94,7 +94,7 @@ impl fmt::Debug for Command {
     }
 }
 
-pub struct ExitStatus(Void);
+pub struct ExitStatus(!);
 
 impl ExitStatus {
     pub fn success(&self) -> bool {
@@ -146,7 +146,7 @@ impl ExitCode {
     }
 }
 
-pub struct Process(Void);
+pub struct Process(!);
 
 impl Process {
     pub fn id(&self) -> u32 {
diff --git a/library/std/src/sys/unsupported/thread.rs b/library/std/src/sys/unsupported/thread.rs
@@ -1,9 +1,9 @@
-use super::{unsupported, Void};
+use super::unsupported;
 use crate::ffi::CStr;
 use crate::io;
 use crate::time::Duration;
 
-pub struct Thread(Void);
+pub struct Thread(!);
 
 pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
 
diff --git a/library/std/src/sys/wasi/net.rs b/library/std/src/sys/wasi/net.rs
@@ -5,7 +5,7 @@ use crate::convert::TryFrom;
 use crate::fmt;
 use crate::io::{self, IoSlice, IoSliceMut};
 use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr};
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::sys_common::FromInner;
 use crate::time::Duration;
 
@@ -343,7 +343,7 @@ impl fmt::Debug for UdpSocket {
     }
 }
 
-pub struct LookupHost(Void);
+pub struct LookupHost(!);
 
 impl LookupHost {
     pub fn port(&self) -> u16 {
diff --git a/library/std/src/sys/wasi/os.rs b/library/std/src/sys/wasi/os.rs
@@ -10,7 +10,7 @@ use crate::os::wasi::prelude::*;
 use crate::path::{self, PathBuf};
 use crate::str;
 use crate::sys::memchr;
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::vec;
 
 // Add a few symbols not in upstream `libc` just yet.
@@ -87,7 +87,7 @@ pub fn chdir(p: &path::Path) -> io::Result<()> {
     }
 }
 
-pub struct SplitPaths<'a>(&'a Void);
+pub struct SplitPaths<'a>(&'a !);
 
 pub fn split_paths(_unparsed: &OsStr) -> SplitPaths<'_> {
     panic!("unsupported")
diff --git a/library/std/src/sys/wasi/thread.rs b/library/std/src/sys/wasi/thread.rs
@@ -3,10 +3,10 @@
 use crate::ffi::CStr;
 use crate::io;
 use crate::mem;
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::time::Duration;
 
-pub struct Thread(Void);
+pub struct Thread(!);
 
 pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
 
diff --git a/library/std/src/sys/wasm/thread.rs b/library/std/src/sys/wasm/thread.rs
@@ -1,9 +1,9 @@
 use crate::ffi::CStr;
 use crate::io;
-use crate::sys::{unsupported, Void};
+use crate::sys::unsupported;
 use crate::time::Duration;
 
-pub struct Thread(Void);
+pub struct Thread(!);
 
 pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
 

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,6 @@ pub fn unsupported_err() -> crate::io::Error {`
`61`	`61`	`)`
`62`	`62`	`}`
`63`	`63`
`64`		`-// This enum is used as the storage for a bunch of types which can't actually`
`65`		`-// exist.`
`66`		`-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]`
`67`		`-pub enum Void {}`
`68`		`-`
`69`	`64`	`pub unsafe fn strlen(start: *const c_char) -> usize {`
`70`	`65`	`let mut str = start;`
`71`	`66`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ use crate::str;`
`6`	`6`	`use crate::sync::Arc;`
`7`	`7`	`use crate::sys::hermit::abi;`
`8`	`8`	`use crate::sys::hermit::abi::IpAddress::{Ipv4, Ipv6};`
`9`		`-use crate::sys::{unsupported, Void};`
	`9`	`+use crate::sys::unsupported;`
`10`	`10`	`use crate::sys_common::AsInner;`
`11`	`11`	`use crate::time::Duration;`
`12`	`12`
`@@ -411,7 +411,7 @@ impl fmt::Debug for UdpSocket {`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`
`414`		`-pub struct LookupHost(Void);`
	`414`	`+pub struct LookupHost(!);`
`415`	`415`
`416`	`416`	`impl LookupHost {`
`417`	`417`	`pub fn port(&self) -> u16 {`
Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,6 @@ pub fn decode_error_kind(code: i32) -> ErrorKind {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`118`		`-// This enum is used as the storage for a bunch of types which can't actually`
`119`		`-// exist.`
`120`		`-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]`
`121`		`-pub enum Void {}`
`122`		`-`
`123`	`118`	`pub unsafe fn strlen(mut s: *const c_char) -> usize {`
`124`	`119`	`let mut n = 0;`
`125`	`120`	`while unsafe { *s } != 0 {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ use crate::io::{self, IoSlice, IoSliceMut};`
`5`	`5`	`use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr, ToSocketAddrs};`
`6`	`6`	`use crate::sync::Arc;`
`7`	`7`	`use crate::sys::fd::FileDesc;`
`8`		`-use crate::sys::{sgx_ineffective, unsupported, AsInner, FromInner, IntoInner, TryIntoInner, Void};`
	`8`	`+use crate::sys::{sgx_ineffective, unsupported, AsInner, FromInner, IntoInner, TryIntoInner};`
`9`	`9`	`use crate::time::Duration;`
`10`	`10`
`11`	`11`	`use super::abi::usercalls;`
`@@ -310,7 +310,7 @@ impl FromInner<Socket> for TcpListener {`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`
`313`		`-pub struct UdpSocket(Void);`
	`313`	`+pub struct UdpSocket(!);`
`314`	`314`
`315`	`315`	`impl UdpSocket {`
`316`	`316`	`pub fn bind(_: io::Result<&SocketAddr>) -> io::Result<UdpSocket> {`
`@@ -462,7 +462,7 @@ impl fmt::Display for NonIpSockAddr {`
`462`	`462`	`}`
`463`	`463`	`}`
`464`	`464`
`465`		`-pub struct LookupHost(Void);`
	`465`	`+pub struct LookupHost(!);`
`466`	`466`
`467`	`467`	`impl LookupHost {`
`468`	`468`	`fn new(host: String) -> io::Result<LookupHost> {`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ use crate::convert::TryFrom;`
`2`	`2`	`use crate::fmt;`
`3`	`3`	`use crate::io::{self, IoSlice, IoSliceMut};`
`4`	`4`	`use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr};`
`5`		`-use crate::sys::{unsupported, Void};`
	`5`	`+use crate::sys::unsupported;`
`6`	`6`	`use crate::time::Duration;`
`7`	`7`
`8`		`-pub struct TcpStream(Void);`
	`8`	`+pub struct TcpStream(!);`
`9`	`9`
`10`	`10`	`impl TcpStream {`
`11`	`11`	`pub fn connect(_: io::Result<&SocketAddr>) -> io::Result<TcpStream> {`
`@@ -107,7 +107,7 @@ impl fmt::Debug for TcpStream {`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`-pub struct TcpListener(Void);`
	`110`	`+pub struct TcpListener(!);`
`111`	`111`
`112`	`112`	`impl TcpListener {`
`113`	`113`	`pub fn bind(_: io::Result<&SocketAddr>) -> io::Result<TcpListener> {`
`@@ -157,7 +157,7 @@ impl fmt::Debug for TcpListener {`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`160`		`-pub struct UdpSocket(Void);`
	`160`	`+pub struct UdpSocket(!);`
`161`	`161`
`162`	`162`	`impl UdpSocket {`
`163`	`163`	`pub fn bind(_: io::Result<&SocketAddr>) -> io::Result<UdpSocket> {`
`@@ -291,7 +291,7 @@ impl fmt::Debug for UdpSocket {`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`-pub struct LookupHost(Void);`
	`294`	`+pub struct LookupHost(!);`
`295`	`295`
`296`	`296`	`impl LookupHost {`
`297`	`297`	`pub fn port(&self) -> u16 {`