diff options
| author | Taiki Endo <te316e89@gmail.com> | 2019-02-27 16:15:56 +0900 |
|---|---|---|
| committer | Taiki Endo <te316e89@gmail.com> | 2019-02-28 04:06:17 +0900 |
| commit | aad9e29f52988c55cd8cee2bd181a2e3c9d436a4 (patch) | |
| tree | 0dc440124b61d17495c4b8e4e680b38cd7b0fa13 | |
| parent | 90dbf59b920054e5808718f4a54323e3653348aa (diff) | |
| download | rust-aad9e29f52988c55cd8cee2bd181a2e3c9d436a4.tar.gz | |
Fix rebase fail
| -rw-r--r-- | src/libstd/sys/unix/io.rs | 5 | ||||
| -rw-r--r-- | src/libstd/sys/unix/net.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/io.rs | 6 | ||||
| -rw-r--r-- | src/libstd/sys/windows/stdio.rs | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/libstd/sys/unix/io.rs b/src/libstd/sys/unix/io.rs index 65e4c6e0577..eb3fa470a65 100644 --- a/src/libstd/sys/unix/io.rs +++ b/src/libstd/sys/unix/io.rs @@ -1,6 +1,7 @@ -use marker::PhantomData; +use crate::marker::PhantomData; +use crate::slice; + use libc::{iovec, c_void}; -use slice; #[repr(transparent)] pub struct IoVec<'a> { diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index 8e8cdf837a9..7712a41ded4 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -11,7 +11,7 @@ use crate::cmp; use libc::{c_int, c_void, size_t, sockaddr, socklen_t, EAI_SYSTEM, MSG_PEEK}; -pub use sys::{cvt, cvt_r}; +pub use crate::sys::{cvt, cvt_r}; #[allow(unused_extern_crates)] pub extern crate libc as netc; diff --git a/src/libstd/sys/windows/io.rs b/src/libstd/sys/windows/io.rs index 662e3047923..54dd271c9d6 100644 --- a/src/libstd/sys/windows/io.rs +++ b/src/libstd/sys/windows/io.rs @@ -1,6 +1,6 @@ -use marker::PhantomData; -use slice; -use sys::c; +use crate::marker::PhantomData; +use crate::slice; +use crate::sys::c; #[repr(transparent)] pub struct IoVec<'a> { diff --git a/src/libstd/sys/windows/stdio.rs b/src/libstd/sys/windows/stdio.rs index b2beaca41b1..b1e76b3b755 100644 --- a/src/libstd/sys/windows/stdio.rs +++ b/src/libstd/sys/windows/stdio.rs @@ -201,7 +201,7 @@ fn read_u16s(handle: c::HANDLE, buf: &mut [u16]) -> io::Result<usize> { const CTRL_Z: u16 = 0x1A; const CTRL_Z_MASK: c::ULONG = 1 << CTRL_Z; let mut input_control = c::CONSOLE_READCONSOLE_CONTROL { - nLength: ::mem::size_of::<c::CONSOLE_READCONSOLE_CONTROL>() as c::ULONG, + nLength: crate::mem::size_of::<c::CONSOLE_READCONSOLE_CONTROL>() as c::ULONG, nInitialChars: 0, dwCtrlWakeupMask: CTRL_Z_MASK, dwControlKeyState: 0, |