std: Remove old_io/old_path/rand modules

This commit entirely removes the old I/O, path, and rand modules. All
functionality has been deprecated and unstable for quite some time now!

1 files changed, 2 insertions, 174 deletions

diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs
index e9d5fca531f..1171c6c068b 100644
--- a/src/libstd/sys/windows/mod.rs
+++ b/src/libstd/sys/windows/mod.rs
@@ -17,136 +17,31 @@ use prelude::v1::*;
 use ffi::{OsStr, OsString};
 use io::{self, ErrorKind};
 use libc;
-use mem;
 #[allow(deprecated)]
 use num::Int;
-use old_io::{self, IoResult, IoError};
 use os::windows::ffi::{OsStrExt, OsStringExt};
 use path::PathBuf;
-use sync::{Once, ONCE_INIT};
 
 pub mod backtrace;
 pub mod c;
 pub mod condvar;
 pub mod ext;
-pub mod fs;
 pub mod fs2;
 pub mod handle;
-pub mod helper_signal;
 pub mod mutex;
 pub mod net;
 pub mod os;
 pub mod os_str;
-pub mod pipe;
 pub mod pipe2;
-pub mod process;
 pub mod process2;
 pub mod rwlock;
 pub mod stack_overflow;
 pub mod sync;
-pub mod tcp;
 pub mod thread;
 pub mod thread_local;
 pub mod time;
-pub mod timer;
-pub mod tty;
-pub mod udp;
 pub mod stdio;
 
-pub mod addrinfo {
-    pub use sys_common::net::get_host_addresses;
-    pub use sys_common::net::get_address_name;
-}
-
-// FIXME: move these to c module
-pub type sock_t = libc::SOCKET;
-pub type wrlen = libc::c_int;
-pub type msglen_t = libc::c_int;
-pub unsafe fn close_sock(sock: sock_t) { let _ = libc::closesocket(sock); }
-
-// windows has zero values as errors
-#[allow(deprecated)]
-fn mkerr_winbool(ret: libc::c_int) -> IoResult<()> {
-    if ret == 0 {
-        Err(last_error())
-    } else {
-        Ok(())
-    }
-}
-
-#[allow(deprecated)]
-pub fn last_error() -> IoError {
-    let errno = os::errno() as i32;
-    let mut err = decode_error(errno);
-    err.detail = Some(os::error_string(errno));
-    err
-}
-
-#[allow(deprecated)]
-pub fn last_net_error() -> IoError {
-    let errno = unsafe { c::WSAGetLastError() as i32 };
-    let mut err = decode_error(errno);
-    err.detail = Some(os::error_string(errno));
-    err
-}
-
-#[allow(deprecated)]
-pub fn last_gai_error(_errno: i32) -> IoError {
-    last_net_error()
-}
-
-/// Convert an `errno` value into a high-level error variant and description.
-#[allow(deprecated)]
-pub fn decode_error(errno: i32) -> IoError {
-    let (kind, desc) = match errno {
-        libc::EOF => (old_io::EndOfFile, "end of file"),
-        libc::ERROR_NO_DATA => (old_io::BrokenPipe, "the pipe is being closed"),
-        libc::ERROR_FILE_NOT_FOUND => (old_io::FileNotFound, "file not found"),
-        libc::ERROR_INVALID_NAME => (old_io::InvalidInput, "invalid file name"),
-        libc::WSAECONNREFUSED => (old_io::ConnectionRefused, "connection refused"),
-        libc::WSAECONNRESET => (old_io::ConnectionReset, "connection reset"),
-        libc::ERROR_ACCESS_DENIED | libc::WSAEACCES =>
-            (old_io::PermissionDenied, "permission denied"),
-        libc::WSAEWOULDBLOCK => {
-            (old_io::ResourceUnavailable, "resource temporarily unavailable")
-        }
-        libc::WSAENOTCONN => (old_io::NotConnected, "not connected"),
-        libc::WSAECONNABORTED => (old_io::ConnectionAborted, "connection aborted"),
-        libc::WSAEADDRNOTAVAIL => (old_io::ConnectionRefused, "address not available"),
-        libc::WSAEADDRINUSE => (old_io::ConnectionRefused, "address in use"),
-        libc::ERROR_BROKEN_PIPE => (old_io::EndOfFile, "the pipe has ended"),
-        libc::ERROR_OPERATION_ABORTED =>
-            (old_io::TimedOut, "operation timed out"),
-        libc::WSAEINVAL => (old_io::InvalidInput, "invalid argument"),
-        libc::ERROR_CALL_NOT_IMPLEMENTED =>
-            (old_io::IoUnavailable, "function not implemented"),
-        libc::ERROR_INVALID_HANDLE =>
-            (old_io::MismatchedFileTypeForOperation,
-             "invalid handle provided to function"),
-        libc::ERROR_NOTHING_TO_TERMINATE =>
-            (old_io::InvalidInput, "no process to kill"),
-        libc::ERROR_ALREADY_EXISTS =>
-            (old_io::PathAlreadyExists, "path already exists"),
-
-        // libuv maps this error code to EISDIR. we do too. if it is found
-        // to be incorrect, we can add in some more machinery to only
-        // return this message when ERROR_INVALID_FUNCTION after certain
-        // Windows calls.
-        libc::ERROR_INVALID_FUNCTION => (old_io::InvalidInput,
-                                         "illegal operation on a directory"),
-
-        _ => (old_io::OtherIoError, "unknown error")
-    };
-    IoError { kind: kind, desc: desc, detail: None }
-}
-
-#[allow(deprecated)]
-pub fn decode_error_detailed(errno: i32) -> IoError {
-    let mut err = decode_error(errno);
-    err.detail = Some(os::error_string(errno));
-    err
-}
-
 pub fn decode_error_kind(errno: i32) -> ErrorKind {
     match errno as libc::c_int {
         libc::ERROR_ACCESS_DENIED => ErrorKind::PermissionDenied,
@@ -170,58 +65,6 @@ pub fn decode_error_kind(errno: i32) -> ErrorKind {
     }
 }
 
-
-#[inline]
-pub fn retry<I, F>(f: F) -> I where F: FnOnce() -> I { f() } // PR rust-lang/rust/#17020
-
-pub fn ms_to_timeval(ms: u64) -> libc::timeval {
-    libc::timeval {
-        tv_sec: (ms / 1000) as libc::c_long,
-        tv_usec: ((ms % 1000) * 1000) as libc::c_long,
-    }
-}
-
-#[allow(deprecated)]
-pub fn wouldblock() -> bool {
-    let err = os::errno();
-    err == libc::WSAEWOULDBLOCK as i32
-}
-
-#[allow(deprecated)]
-pub fn set_nonblocking(fd: sock_t, nb: bool) {
-    let mut set = nb as libc::c_ulong;
-    if unsafe { c::ioctlsocket(fd, c::FIONBIO, &mut set) } != 0 {
-        // The above function should not return an error unless we passed it
-        // invalid parameters. Panic on errors.
-        panic!("set_nonblocking called with invalid parameters: {}", last_error());
-    }
-}
-
-pub fn init_net() {
-    unsafe {
-        static START: Once = ONCE_INIT;
-
-        START.call_once(|| {
-            let mut data: c::WSADATA = mem::zeroed();
-            let ret = c::WSAStartup(0x202, // version 2.2
-                                    &mut data);
-            assert_eq!(ret, 0);
-        });
-    }
-}
-
-#[allow(deprecated)]
-pub fn to_utf16(s: Option<&str>) -> IoResult<Vec<u16>> {
-    match s {
-        Some(s) => Ok(to_utf16_os(OsStr::from_str(s))),
-        None => Err(IoError {
-            kind: old_io::InvalidInput,
-            desc: "valid unicode input required",
-            detail: None,
-        }),
-    }
-}
-
 fn to_utf16_os(s: &OsStr) -> Vec<u16> {
     let mut v: Vec<_> = s.encode_wide().collect();
     v.push(0);
@@ -242,7 +85,7 @@ fn to_utf16_os(s: &OsStr) -> Vec<u16> {
 // Once the syscall has completed (errors bail out early) the second closure is
 // yielded the data which has been read from the syscall. The return value
 // from this closure is then the return value of the function.
-fn fill_utf16_buf_base<F1, F2, T>(mut f1: F1, f2: F2) -> Result<T, ()>
+fn fill_utf16_buf<F1, F2, T>(mut f1: F1, f2: F2) -> io::Result<T>
     where F1: FnMut(*mut u16, libc::DWORD) -> libc::DWORD,
           F2: FnOnce(&[u16]) -> T
 {
@@ -274,7 +117,7 @@ fn fill_utf16_buf_base<F1, F2, T>(mut f1: F1, f2: F2) -> Result<T, ()>
             c::SetLastError(0);
             let k = match f1(buf.as_mut_ptr(), n as libc::DWORD) {
                 0 if libc::GetLastError() == 0 => 0,
-                0 => return Err(()),
+                0 => return Err(io::Error::last_os_error()),
                 n => n,
             } as usize;
             if k == n && libc::GetLastError() ==
@@ -289,21 +132,6 @@ fn fill_utf16_buf_base<F1, F2, T>(mut f1: F1, f2: F2) -> Result<T, ()>
     }
 }
 
-#[allow(deprecated)]
-fn fill_utf16_buf<F1, F2, T>(f1: F1, f2: F2) -> IoResult<T>
-    where F1: FnMut(*mut u16, libc::DWORD) -> libc::DWORD,
-          F2: FnOnce(&[u16]) -> T
-{
-    fill_utf16_buf_base(f1, f2).map_err(|()| IoError::last_error())
-}
-
-fn fill_utf16_buf_new<F1, F2, T>(f1: F1, f2: F2) -> io::Result<T>
-    where F1: FnMut(*mut u16, libc::DWORD) -> libc::DWORD,
-          F2: FnOnce(&[u16]) -> T
-{
-    fill_utf16_buf_base(f1, f2).map_err(|()| io::Error::last_os_error())
-}
-
 fn os2path(s: &[u16]) -> PathBuf {
     PathBuf::from(OsString::from_wide(s))
 }