diff options
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/condvar.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/helper_signal.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/mutex.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/pipe.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/tcp.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/tty.rs | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/src/libstd/sys/windows/condvar.rs b/src/libstd/sys/windows/condvar.rs index 7f9d669c447..291a8024cfc 100644 --- a/src/libstd/sys/windows/condvar.rs +++ b/src/libstd/sys/windows/condvar.rs @@ -9,9 +9,9 @@ // except according to those terms. use cell::UnsafeCell; -use libc::{mod, DWORD}; +use libc::{self, DWORD}; use os; -use sys::mutex::{mod, Mutex}; +use sys::mutex::{self, Mutex}; use sys::sync as ffi; use time::Duration; diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index 523d60c71aa..9a942300656 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -11,7 +11,7 @@ //! Blocking Windows-based file I/O use alloc::arc::Arc; -use libc::{mod, c_int}; +use libc::{self, c_int}; use c_str::CString; use mem; diff --git a/src/libstd/sys/windows/helper_signal.rs b/src/libstd/sys/windows/helper_signal.rs index c547c79e83a..a9fb2c68227 100644 --- a/src/libstd/sys/windows/helper_signal.rs +++ b/src/libstd/sys/windows/helper_signal.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use libc::{mod, BOOL, LPCSTR, HANDLE, LPSECURITY_ATTRIBUTES, CloseHandle}; +use libc::{self, BOOL, LPCSTR, HANDLE, LPSECURITY_ATTRIBUTES, CloseHandle}; use ptr; pub type signal = HANDLE; diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index 1034f0615d9..0e706c3cc6a 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.rs @@ -22,7 +22,7 @@ use prelude::v1::*; use num; use mem; -use io::{mod, IoResult, IoError}; +use io::{self, IoResult, IoError}; use sync::{Once, ONCE_INIT}; macro_rules! helper_init { (static $name:ident: Helper<$m:ty>) => ( diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs index e0fa02b5599..f561e0121b3 100644 --- a/src/libstd/sys/windows/mutex.rs +++ b/src/libstd/sys/windows/mutex.rs @@ -11,7 +11,7 @@ use prelude::v1::*; use sync::atomic; -use alloc::{mod, heap}; +use alloc::{self, heap}; use libc::DWORD; use sys::sync as ffi; diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index f173d5fc6d4..0edae75a9ce 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -91,9 +91,9 @@ use c_str::CString; use mem; use ptr; use sync::{atomic, Arc, Mutex}; -use io::{mod, IoError, IoResult}; +use io::{self, IoError, IoResult}; -use sys_common::{mod, eof}; +use sys_common::{self, eof}; use super::{c, os, timer, to_utf16, decode_error_detailed}; diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index cb99a886ce4..81e8f974a12 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -24,7 +24,7 @@ use hash::Hash; use io::{IoResult, IoError}; use sys::fs; -use sys::{mod, retry, c, wouldblock, set_nonblocking, ms_to_timeval, timer}; +use sys::{self, retry, c, wouldblock, set_nonblocking, ms_to_timeval, timer}; use sys::fs::FileDesc; use sys_common::helper_thread::Helper; use sys_common::{AsInner, mkerr_libc, timeout}; diff --git a/src/libstd/sys/windows/tcp.rs b/src/libstd/sys/windows/tcp.rs index 5a929f6b2b5..1c8ec2a80a7 100644 --- a/src/libstd/sys/windows/tcp.rs +++ b/src/libstd/sys/windows/tcp.rs @@ -17,8 +17,8 @@ use prelude::v1::*; use super::{last_error, last_net_error, retry, sock_t}; use sync::{Arc, atomic}; use sys::fs::FileDesc; -use sys::{mod, c, set_nonblocking, wouldblock, timer}; -use sys_common::{mod, timeout, eof, net}; +use sys::{self, c, set_nonblocking, wouldblock, timer}; +use sys_common::{self, timeout, eof, net}; pub use sys_common::net::TcpStream; diff --git a/src/libstd/sys/windows/tty.rs b/src/libstd/sys/windows/tty.rs index 7591025d76d..4305f7743b5 100644 --- a/src/libstd/sys/windows/tty.rs +++ b/src/libstd/sys/windows/tty.rs @@ -27,7 +27,7 @@ use prelude::v1::*; -use io::{mod, IoError, IoResult, MemReader}; +use io::{self, IoError, IoResult, MemReader}; use iter::repeat; use libc::types::os::arch::extra::LPCVOID; use libc::{c_int, HANDLE, LPDWORD, DWORD, LPVOID}; |
