diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-04-09 15:54:43 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-04-10 00:24:44 +0530 |
| commit | 1a6e100f72d7479e667bef36c8f90c3264075783 (patch) | |
| tree | e8db06f642f52716dc3b2e46295c89790cc09914 /src/libstd/sys/windows | |
| parent | cdfbb11f680836d9db7f3062827c75470c5588c3 (diff) | |
| parent | 561fdec1350056d77245a17d59c7d740c95621d1 (diff) | |
| download | rust-1a6e100f72d7479e667bef36c8f90c3264075783.tar.gz rust-1a6e100f72d7479e667bef36c8f90c3264075783.zip | |
Rollup merge of #24216 - alexcrichton:stabilize-from-raw-os-error, r=aturon
This commit stabilizes the old `io::Error::from_os_error` after being renamed to use the `raw_os_error` terminology instead. This function is often useful when writing bindings to OS functions but only actually converting to an I/O error at a later point.
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/net.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/net.rs b/src/libstd/sys/windows/net.rs index 12a8ef99d76..5ced8863e62 100644 --- a/src/libstd/sys/windows/net.rs +++ b/src/libstd/sys/windows/net.rs @@ -43,7 +43,7 @@ pub fn init() { /// Returns the last error from the Windows socket interface. fn last_error() -> io::Error { - io::Error::from_os_error(unsafe { c::WSAGetLastError() }) + io::Error::from_raw_os_error(unsafe { c::WSAGetLastError() }) } /// Checks if the signed integer is the Windows constant `SOCKET_ERROR` (-1) |