diff options
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/mod.rs | 5 | ||||
| -rw-r--r-- | src/libstd/io/net/tcp.rs | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 94d60cb3ce7..c72cc0ded9b 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -313,7 +313,8 @@ impl IoError { libc::ERROR_INVALID_NAME => (InvalidInput, "invalid file name"), libc::WSAECONNREFUSED => (ConnectionRefused, "connection refused"), libc::WSAECONNRESET => (ConnectionReset, "connection reset"), - libc::WSAEACCES => (PermissionDenied, "permission denied"), + libc::ERROR_ACCESS_DENIED | libc::WSAEACCES => + (PermissionDenied, "permission denied"), libc::WSAEWOULDBLOCK => { (ResourceUnavailable, "resource temporarily unavailable") } @@ -327,7 +328,7 @@ impl IoError { libc::WSAEINVAL => (InvalidInput, "invalid argument"), libc::ERROR_CALL_NOT_IMPLEMENTED => (IoUnavailable, "function not implemented"), - libc::ERROR_CALL_NOT_IMPLEMENTED => + libc::ERROR_INVALID_HANDLE => (MismatchedFileTypeForOperation, "invalid handle provided to function"), libc::ERROR_NOTHING_TO_TERMINATE => diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 8ce77faa296..6c773467553 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -982,7 +982,8 @@ mod test { match TcpListener::bind(ip_str.as_slice(), port).listen() { Ok(..) => fail!(), Err(e) => { - assert!(e.kind == ConnectionRefused || e.kind == OtherIoError); + assert!(e.kind == ConnectionRefused || e.kind == OtherIoError, + "unknown error: {} {}", e, e.kind); } } }) |