Fix rebase fail

rust-lang · Feb 27, 2019 · aad9e29 · aad9e29
1 parent 90dbf59
commit aad9e29
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,