diff options
| author | bors <bors@rust-lang.org> | 2016-07-15 03:06:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-15 03:06:58 -0700 |
| commit | 3cc3ad11e6fadcba443cc50ba6ed03ab04d34355 (patch) | |
| tree | 8f740d9a475036c51e4524543e9571e4f9664354 /src/libstd/sys/windows | |
| parent | b6c1ef3745f707a0f76f17dc2b313b831ee1bfb0 (diff) | |
| parent | 89593741540e125c768432bd98dbd4fdd1abd286 (diff) | |
| download | rust-3cc3ad11e6fadcba443cc50ba6ed03ab04d34355.tar.gz rust-3cc3ad11e6fadcba443cc50ba6ed03ab04d34355.zip | |
Auto merge of #34819 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 7 pull requests - Successful merges: #34456, #34733, #34777, #34794, #34799, #34804, #34818 - Failed merges: #33951
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/handle.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/pipe.rs | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/libstd/sys/windows/handle.rs b/src/libstd/sys/windows/handle.rs index 74546bb893b..d10abae2865 100644 --- a/src/libstd/sys/windows/handle.rs +++ b/src/libstd/sys/windows/handle.rs @@ -46,10 +46,10 @@ impl Handle { pub fn new_event(manual: bool, init: bool) -> io::Result<Handle> { unsafe { - let event = c::CreateEventW(0 as *mut _, + let event = c::CreateEventW(ptr::null_mut(), manual as c::BOOL, init as c::BOOL, - 0 as *const _); + ptr::null()); if event.is_null() { Err(io::Error::last_os_error()) } else { diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index 8631a63d653..6e9c67051a6 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -12,9 +12,10 @@ use prelude::v1::*; use os::windows::prelude::*; use ffi::OsStr; -use path::Path; use io; use mem; +use path::Path; +use ptr; use rand::{self, Rng}; use slice; use sys::c; @@ -66,7 +67,7 @@ pub fn anon_pipe() -> io::Result<(AnonPipe, AnonPipe)> { 4096, 4096, 0, - 0 as *mut _); + ptr::null_mut()); // We pass the FILE_FLAG_FIRST_PIPE_INSTANCE flag above, and we're // also just doing a best effort at selecting a unique name. If |
