From aad9e29f52988c55cd8cee2bd181a2e3c9d436a4 Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Wed, 27 Feb 2019 16:15:56 +0900
Subject: Fix rebase fail

---
 src/libstd/sys/windows/io.rs    | 6 +++---
 src/libstd/sys/windows/stdio.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/libstd/sys/windows')

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,
-- 
cgit 1.4.1-3-g733a5