Skip to content

Commit d59d52e

Browse files
committed
ErrorKind: Reformat the mapping table (windows)
use ErrorKind::*; I don't feel confident enough about Windows things to reorder this alphabetically Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
1 parent 5513faa commit d59d52e

File tree

1 file changed

+24
-22
lines changed
  • library/std/src/sys/windows

1 file changed

+24
-22
lines changed

library/std/src/sys/windows/mod.rs

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,18 @@ pub unsafe fn cleanup() {
6161
}
6262

6363
pub fn decode_error_kind(errno: i32) -> ErrorKind {
64+
use ErrorKind::*;
65+
6466
match errno as c::DWORD {
65-
c::ERROR_ACCESS_DENIED => return ErrorKind::PermissionDenied,
66-
c::ERROR_ALREADY_EXISTS => return ErrorKind::AlreadyExists,
67-
c::ERROR_FILE_EXISTS => return ErrorKind::AlreadyExists,
68-
c::ERROR_BROKEN_PIPE => return ErrorKind::BrokenPipe,
69-
c::ERROR_FILE_NOT_FOUND => return ErrorKind::NotFound,
70-
c::ERROR_PATH_NOT_FOUND => return ErrorKind::NotFound,
71-
c::ERROR_NO_DATA => return ErrorKind::BrokenPipe,
72-
c::ERROR_INVALID_PARAMETER => return ErrorKind::InvalidInput,
73-
c::ERROR_NOT_ENOUGH_MEMORY | c::ERROR_OUTOFMEMORY => return ErrorKind::OutOfMemory,
67+
c::ERROR_ACCESS_DENIED => return PermissionDenied,
68+
c::ERROR_ALREADY_EXISTS => return AlreadyExists,
69+
c::ERROR_FILE_EXISTS => return AlreadyExists,
70+
c::ERROR_BROKEN_PIPE => return BrokenPipe,
71+
c::ERROR_FILE_NOT_FOUND => return NotFound,
72+
c::ERROR_PATH_NOT_FOUND => return NotFound,
73+
c::ERROR_NO_DATA => return BrokenPipe,
74+
c::ERROR_INVALID_PARAMETER => return InvalidInput,
75+
c::ERROR_NOT_ENOUGH_MEMORY | c::ERROR_OUTOFMEMORY => return OutOfMemory,
7476
c::ERROR_SEM_TIMEOUT
7577
| c::WAIT_TIMEOUT
7678
| c::ERROR_DRIVER_CANCEL_TIMEOUT
@@ -86,24 +88,24 @@ pub fn decode_error_kind(errno: i32) -> ErrorKind {
8688
| c::DNS_ERROR_RECORD_TIMED_OUT
8789
| c::ERROR_IPSEC_IKE_TIMED_OUT
8890
| c::ERROR_RUNLEVEL_SWITCH_TIMEOUT
89-
| c::ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT => return ErrorKind::TimedOut,
90-
c::ERROR_CALL_NOT_IMPLEMENTED => return ErrorKind::Unsupported,
91+
| c::ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT => return TimedOut,
92+
c::ERROR_CALL_NOT_IMPLEMENTED => return Unsupported,
9193
_ => {}
9294
}
9395

9496
match errno {
95-
c::WSAEACCES => ErrorKind::PermissionDenied,
96-
c::WSAEADDRINUSE => ErrorKind::AddrInUse,
97-
c::WSAEADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
98-
c::WSAECONNABORTED => ErrorKind::ConnectionAborted,
99-
c::WSAECONNREFUSED => ErrorKind::ConnectionRefused,
100-
c::WSAECONNRESET => ErrorKind::ConnectionReset,
101-
c::WSAEINVAL => ErrorKind::InvalidInput,
102-
c::WSAENOTCONN => ErrorKind::NotConnected,
103-
c::WSAEWOULDBLOCK => ErrorKind::WouldBlock,
104-
c::WSAETIMEDOUT => ErrorKind::TimedOut,
97+
c::WSAEACCES => PermissionDenied,
98+
c::WSAEADDRINUSE => AddrInUse,
99+
c::WSAEADDRNOTAVAIL => AddrNotAvailable,
100+
c::WSAECONNABORTED => ConnectionAborted,
101+
c::WSAECONNREFUSED => ConnectionRefused,
102+
c::WSAECONNRESET => ConnectionReset,
103+
c::WSAEINVAL => InvalidInput,
104+
c::WSAENOTCONN => NotConnected,
105+
c::WSAEWOULDBLOCK => WouldBlock,
106+
c::WSAETIMEDOUT => TimedOut,
105107

106-
_ => ErrorKind::Uncategorized,
108+
_ => Uncategorized,
107109
}
108110
}
109111

0 commit comments

Comments
 (0)