From aad9e29f52988c55cd8cee2bd181a2e3c9d436a4 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Wed, 27 Feb 2019 16:15:56 +0900 Subject: Fix rebase fail --- src/libstd/sys/unix/io.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/libstd/sys/unix/io.rs') 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> { -- cgit 1.4.1-3-g733a5