about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCarsten Andrich <carsten@andrich.name>2020-05-02 10:56:42 +0200
committerCarsten Andrich <carsten@andrich.name>2020-05-02 10:56:42 +0200
commit86679967e3cc895d2b5ab4bb974664ff283fe043 (patch)
tree2e6440d5069ffb94b20c945cff67d2c27c7adea0
parentc88e6a75f5f681610142aaba351cdd6e30deed95 (diff)
downloadrust-86679967e3cc895d2b5ab4bb974664ff283fe043.tar.gz
rust-86679967e3cc895d2b5ab4bb974664ff283fe043.zip
use or pattern to match error codes that map to ErrorKind::TimedOut
-rw-r--r--src/libstd/sys/windows/mod.rs30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs
index a0d207e932e..b34686d42b7 100644
--- a/src/libstd/sys/windows/mod.rs
+++ b/src/libstd/sys/windows/mod.rs
@@ -61,21 +61,21 @@ pub fn decode_error_kind(errno: i32) -> ErrorKind {
         c::ERROR_FILE_NOT_FOUND => return ErrorKind::NotFound,
         c::ERROR_PATH_NOT_FOUND => return ErrorKind::NotFound,
         c::ERROR_NO_DATA => return ErrorKind::BrokenPipe,
-        c::ERROR_SEM_TIMEOUT => return ErrorKind::TimedOut,
-        c::WAIT_TIMEOUT => return ErrorKind::TimedOut,
-        c::ERROR_DRIVER_CANCEL_TIMEOUT => return ErrorKind::TimedOut,
-        c::ERROR_OPERATION_ABORTED => return ErrorKind::TimedOut,
-        c::ERROR_SERVICE_REQUEST_TIMEOUT => return ErrorKind::TimedOut,
-        c::ERROR_COUNTER_TIMEOUT => return ErrorKind::TimedOut,
-        c::ERROR_TIMEOUT => return ErrorKind::TimedOut,
-        c::ERROR_RESOURCE_CALL_TIMED_OUT => return ErrorKind::TimedOut,
-        c::ERROR_CTX_MODEM_RESPONSE_TIMEOUT => return ErrorKind::TimedOut,
-        c::ERROR_CTX_CLIENT_QUERY_TIMEOUT => return ErrorKind::TimedOut,
-        c::FRS_ERR_SYSVOL_POPULATE_TIMEOUT => return ErrorKind::TimedOut,
-        c::ERROR_DS_TIMELIMIT_EXCEEDED => return ErrorKind::TimedOut,
-        c::DNS_ERROR_RECORD_TIMED_OUT => return ErrorKind::TimedOut,
-        c::ERROR_IPSEC_IKE_TIMED_OUT => return ErrorKind::TimedOut,
-        c::ERROR_RUNLEVEL_SWITCH_TIMEOUT => return ErrorKind::TimedOut,
+        c::ERROR_SEM_TIMEOUT |
+        c::WAIT_TIMEOUT |
+        c::ERROR_DRIVER_CANCEL_TIMEOUT |
+        c::ERROR_OPERATION_ABORTED |
+        c::ERROR_SERVICE_REQUEST_TIMEOUT |
+        c::ERROR_COUNTER_TIMEOUT |
+        c::ERROR_TIMEOUT |
+        c::ERROR_RESOURCE_CALL_TIMED_OUT |
+        c::ERROR_CTX_MODEM_RESPONSE_TIMEOUT |
+        c::ERROR_CTX_CLIENT_QUERY_TIMEOUT |
+        c::FRS_ERR_SYSVOL_POPULATE_TIMEOUT |
+        c::ERROR_DS_TIMELIMIT_EXCEEDED |
+        c::DNS_ERROR_RECORD_TIMED_OUT |
+        c::ERROR_IPSEC_IKE_TIMED_OUT |
+        c::ERROR_RUNLEVEL_SWITCH_TIMEOUT |
         c::ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT => return ErrorKind::TimedOut,
         _ => {}
     }