bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix rebase fail

Browse source
This commit is contained in:
Taiki Endo 2019-02-27 16:15:56 +09:00
parent 90dbf59b92
commit aad9e29f52
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libstd/sys/unix/io.rs
View file

@ -1,6 +1,7 @@
use marker::PhantomData; use crate::marker::PhantomData;
use crate::slice;
use libc::{iovec, c_void}; use libc::{iovec, c_void};
use slice;
#[repr(transparent)] #[repr(transparent)]
pub struct IoVec<'a> { pub struct IoVec<'a> {

2
src/libstd/sys/unix/net.rs
View file

@ -11,7 +11,7 @@ use crate::cmp;
use libc::{c_int, c_void, size_t, sockaddr, socklen_t, EAI_SYSTEM, MSG_PEEK}; 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)] #[allow(unused_extern_crates)]
pub extern crate libc as netc; pub extern crate libc as netc;

6
src/libstd/sys/windows/io.rs
View file

@ -1,6 +1,6 @@
use marker::PhantomData; use crate::marker::PhantomData;
use slice; use crate::slice;
use sys::c; use crate::sys::c;
#[repr(transparent)] #[repr(transparent)]
pub struct IoVec<'a> { pub struct IoVec<'a> {

2
src/libstd/sys/windows/stdio.rs
View file

@ -201,7 +201,7 @@ fn read_u16s(handle: c::HANDLE, buf: &mut [u16]) -> io::Result<usize> {
const CTRL_Z: u16 = 0x1A; const CTRL_Z: u16 = 0x1A;
const CTRL_Z_MASK: c::ULONG = 1 << CTRL_Z; const CTRL_Z_MASK: c::ULONG = 1 << CTRL_Z;
let mut input_control = c::CONSOLE_READCONSOLE_CONTROL { 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, nInitialChars: 0,
dwCtrlWakeupMask: CTRL_Z_MASK, dwCtrlWakeupMask: CTRL_Z_MASK,
dwControlKeyState: 0, dwControlKeyState: 0,