Skip to content

Commit 9580f33

Browse files
committed
Windows error codes: Move to a separate module
We're going to add many more of these. This commit is pure code motion, plus the necessary administrivia, as I have veried with the following runes: $ git-diff HEAD~ | grep '^+' |sort >plus $ git-diff HEAD~ | grep '^-' | perl -pe 's/^-/+/' |sort >min $ diff -ub min plus |less The output is precisely the expected `mod` and `use` directives. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
1 parent e7fb1a7 commit 9580f33

File tree

2 files changed

+56
-49
lines changed

2 files changed

+56
-49
lines changed

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

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ use crate::ptr;
1010

1111
use libc::{c_void, size_t, wchar_t};
1212

13+
#[path = "c/errors.rs"] // c.rs is included from two places so we need to specify this
14+
mod errors;
15+
pub use errors::*;
16+
1317
pub use self::EXCEPTION_DISPOSITION::*;
1418
pub use self::FILE_INFO_BY_HANDLE_CLASS::*;
1519

@@ -132,19 +136,6 @@ pub const WSASYS_STATUS_LEN: usize = 128;
132136
pub const WSAPROTOCOL_LEN: DWORD = 255;
133137
pub const INVALID_SOCKET: SOCKET = !0;
134138

135-
pub const WSAEACCES: c_int = 10013;
136-
pub const WSAEINVAL: c_int = 10022;
137-
pub const WSAEWOULDBLOCK: c_int = 10035;
138-
pub const WSAEPROTOTYPE: c_int = 10041;
139-
pub const WSAEADDRINUSE: c_int = 10048;
140-
pub const WSAEADDRNOTAVAIL: c_int = 10049;
141-
pub const WSAECONNABORTED: c_int = 10053;
142-
pub const WSAECONNRESET: c_int = 10054;
143-
pub const WSAENOTCONN: c_int = 10057;
144-
pub const WSAESHUTDOWN: c_int = 10058;
145-
pub const WSAETIMEDOUT: c_int = 10060;
146-
pub const WSAECONNREFUSED: c_int = 10061;
147-
148139
pub const MAX_PROTOCOL_CHAIN: DWORD = 7;
149140

150141
pub const MAXIMUM_REPARSE_DATA_BUFFER_SIZE: usize = 16 * 1024;
@@ -164,42 +155,6 @@ pub const STD_ERROR_HANDLE: DWORD = -12i32 as DWORD;
164155

165156
pub const PROGRESS_CONTINUE: DWORD = 0;
166157

167-
// List of Windows system error codes with descriptions:
168-
// https://docs.microsoft.com/en-us/windows/win32/debug/system-error-codes#system-error-codes
169-
pub const ERROR_FILE_NOT_FOUND: DWORD = 2;
170-
pub const ERROR_PATH_NOT_FOUND: DWORD = 3;
171-
pub const ERROR_ACCESS_DENIED: DWORD = 5;
172-
pub const ERROR_INVALID_HANDLE: DWORD = 6;
173-
pub const ERROR_NOT_ENOUGH_MEMORY: DWORD = 8;
174-
pub const ERROR_OUTOFMEMORY: DWORD = 14;
175-
pub const ERROR_NO_MORE_FILES: DWORD = 18;
176-
pub const ERROR_SHARING_VIOLATION: DWORD = 32;
177-
pub const ERROR_HANDLE_EOF: DWORD = 38;
178-
pub const ERROR_FILE_EXISTS: DWORD = 80;
179-
pub const ERROR_INVALID_PARAMETER: DWORD = 87;
180-
pub const ERROR_BROKEN_PIPE: DWORD = 109;
181-
pub const ERROR_CALL_NOT_IMPLEMENTED: DWORD = 120;
182-
pub const ERROR_SEM_TIMEOUT: DWORD = 121;
183-
pub const ERROR_INSUFFICIENT_BUFFER: DWORD = 122;
184-
pub const ERROR_ALREADY_EXISTS: DWORD = 183;
185-
pub const ERROR_ENVVAR_NOT_FOUND: DWORD = 203;
186-
pub const ERROR_NO_DATA: DWORD = 232;
187-
pub const ERROR_DRIVER_CANCEL_TIMEOUT: DWORD = 594;
188-
pub const ERROR_OPERATION_ABORTED: DWORD = 995;
189-
pub const ERROR_IO_PENDING: DWORD = 997;
190-
pub const ERROR_SERVICE_REQUEST_TIMEOUT: DWORD = 1053;
191-
pub const ERROR_COUNTER_TIMEOUT: DWORD = 1121;
192-
pub const ERROR_TIMEOUT: DWORD = 1460;
193-
pub const ERROR_RESOURCE_CALL_TIMED_OUT: DWORD = 5910;
194-
pub const ERROR_CTX_MODEM_RESPONSE_TIMEOUT: DWORD = 7012;
195-
pub const ERROR_CTX_CLIENT_QUERY_TIMEOUT: DWORD = 7040;
196-
pub const FRS_ERR_SYSVOL_POPULATE_TIMEOUT: DWORD = 8014;
197-
pub const ERROR_DS_TIMELIMIT_EXCEEDED: DWORD = 8226;
198-
pub const DNS_ERROR_RECORD_TIMED_OUT: DWORD = 9705;
199-
pub const ERROR_IPSEC_IKE_TIMED_OUT: DWORD = 13805;
200-
pub const ERROR_RUNLEVEL_SWITCH_TIMEOUT: DWORD = 15402;
201-
pub const ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT: DWORD = 15403;
202-
203158
pub const E_NOTIMPL: HRESULT = 0x80004001u32 as HRESULT;
204159

205160
pub const INVALID_HANDLE_VALUE: HANDLE = !0 as HANDLE;
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// List of Windows system error codes with descriptions:
2+
// https://docs.microsoft.com/en-us/windows/win32/debug/system-error-codes#system-error-codes
3+
4+
use super::{c_int, DWORD};
5+
6+
pub const ERROR_FILE_NOT_FOUND: DWORD = 2;
7+
pub const ERROR_PATH_NOT_FOUND: DWORD = 3;
8+
pub const ERROR_ACCESS_DENIED: DWORD = 5;
9+
pub const ERROR_INVALID_HANDLE: DWORD = 6;
10+
pub const ERROR_NOT_ENOUGH_MEMORY: DWORD = 8;
11+
pub const ERROR_OUTOFMEMORY: DWORD = 14;
12+
pub const ERROR_NO_MORE_FILES: DWORD = 18;
13+
pub const ERROR_SHARING_VIOLATION: DWORD = 32;
14+
pub const ERROR_HANDLE_EOF: DWORD = 38;
15+
pub const ERROR_FILE_EXISTS: DWORD = 80;
16+
pub const ERROR_INVALID_PARAMETER: DWORD = 87;
17+
pub const ERROR_BROKEN_PIPE: DWORD = 109;
18+
pub const ERROR_CALL_NOT_IMPLEMENTED: DWORD = 120;
19+
pub const ERROR_SEM_TIMEOUT: DWORD = 121;
20+
pub const ERROR_INSUFFICIENT_BUFFER: DWORD = 122;
21+
pub const ERROR_ALREADY_EXISTS: DWORD = 183;
22+
pub const ERROR_ENVVAR_NOT_FOUND: DWORD = 203;
23+
pub const ERROR_NO_DATA: DWORD = 232;
24+
pub const ERROR_DRIVER_CANCEL_TIMEOUT: DWORD = 594;
25+
pub const ERROR_OPERATION_ABORTED: DWORD = 995;
26+
pub const ERROR_IO_PENDING: DWORD = 997;
27+
pub const ERROR_SERVICE_REQUEST_TIMEOUT: DWORD = 1053;
28+
pub const ERROR_COUNTER_TIMEOUT: DWORD = 1121;
29+
pub const ERROR_TIMEOUT: DWORD = 1460;
30+
pub const ERROR_RESOURCE_CALL_TIMED_OUT: DWORD = 5910;
31+
pub const ERROR_CTX_MODEM_RESPONSE_TIMEOUT: DWORD = 7012;
32+
pub const ERROR_CTX_CLIENT_QUERY_TIMEOUT: DWORD = 7040;
33+
pub const FRS_ERR_SYSVOL_POPULATE_TIMEOUT: DWORD = 8014;
34+
pub const ERROR_DS_TIMELIMIT_EXCEEDED: DWORD = 8226;
35+
pub const DNS_ERROR_RECORD_TIMED_OUT: DWORD = 9705;
36+
pub const ERROR_IPSEC_IKE_TIMED_OUT: DWORD = 13805;
37+
pub const ERROR_RUNLEVEL_SWITCH_TIMEOUT: DWORD = 15402;
38+
pub const ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT: DWORD = 15403;
39+
40+
pub const WSAEACCES: c_int = 10013;
41+
pub const WSAEINVAL: c_int = 10022;
42+
pub const WSAEWOULDBLOCK: c_int = 10035;
43+
pub const WSAEPROTOTYPE: c_int = 10041;
44+
pub const WSAEADDRINUSE: c_int = 10048;
45+
pub const WSAEADDRNOTAVAIL: c_int = 10049;
46+
pub const WSAECONNABORTED: c_int = 10053;
47+
pub const WSAECONNRESET: c_int = 10054;
48+
pub const WSAENOTCONN: c_int = 10057;
49+
pub const WSAESHUTDOWN: c_int = 10058;
50+
pub const WSAETIMEDOUT: c_int = 10060;
51+
pub const WSAECONNREFUSED: c_int = 10061;
52+

0 commit comments

Comments
 (0)