From 914853bbfa912c4a49379997c0dc938801aa9c4e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 11 Sep 2017 19:46:18 -0600 Subject: [PATCH] Fix tidy checks --- src/libstd/sys/redox/syscall/call.rs | 6 ++- src/libstd/sys/redox/syscall/data.rs | 56 ++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/libstd/sys/redox/syscall/call.rs b/src/libstd/sys/redox/syscall/call.rs index b0ff69dd6345..7770a2f3f1b5 100644 --- a/src/libstd/sys/redox/syscall/call.rs +++ b/src/libstd/sys/redox/syscall/call.rs @@ -140,7 +140,8 @@ pub fn ftruncate(fd: usize, len: usize) -> Result { // Change modify and/or access times pub fn futimens(fd: usize, times: &[TimeSpec]) -> Result { - unsafe { syscall3(SYS_FUTIMENS, fd, times.as_ptr() as usize, times.len() * mem::size_of::()) } + unsafe { syscall3(SYS_FUTIMENS, fd, times.as_ptr() as usize, + times.len() * mem::size_of::()) } } /// Fast userspace mutex @@ -291,7 +292,8 @@ pub fn setreuid(ruid: usize, euid: usize) -> Result { } /// Set up a signal handler -pub fn sigaction(sig: usize, act: Option<&SigAction>, oldact: Option<&mut SigAction>) -> Result { +pub fn sigaction(sig: usize, act: Option<&SigAction>, oldact: Option<&mut SigAction>) +-> Result { unsafe { syscall4(SYS_SIGACTION, sig, act.map(|x| x as *const _).unwrap_or_else(ptr::null) as usize, oldact.map(|x| x as *mut _).unwrap_or_else(ptr::null_mut) as usize, diff --git a/src/libstd/sys/redox/syscall/data.rs b/src/libstd/sys/redox/syscall/data.rs index 3566d85d9b45..2e784ebc8a5c 100644 --- a/src/libstd/sys/redox/syscall/data.rs +++ b/src/libstd/sys/redox/syscall/data.rs @@ -22,7 +22,10 @@ impl Deref for Event { type Target = [u8]; fn deref(&self) -> &[u8] { unsafe { - slice::from_raw_parts(self as *const Event as *const u8, mem::size_of::()) as &[u8] + slice::from_raw_parts( + self as *const Event as *const u8, + mem::size_of::() + ) as &[u8] } } } @@ -30,7 +33,10 @@ impl Deref for Event { impl DerefMut for Event { fn deref_mut(&mut self) -> &mut [u8] { unsafe { - slice::from_raw_parts_mut(self as *mut Event as *mut u8, mem::size_of::()) as &mut [u8] + slice::from_raw_parts_mut( + self as *mut Event as *mut u8, + mem::size_of::() + ) as &mut [u8] } } } @@ -52,7 +58,10 @@ impl Deref for Packet { type Target = [u8]; fn deref(&self) -> &[u8] { unsafe { - slice::from_raw_parts(self as *const Packet as *const u8, mem::size_of::()) as &[u8] + slice::from_raw_parts( + self as *const Packet as *const u8, + mem::size_of::() + ) as &[u8] } } } @@ -60,7 +69,10 @@ impl Deref for Packet { impl DerefMut for Packet { fn deref_mut(&mut self) -> &mut [u8] { unsafe { - slice::from_raw_parts_mut(self as *mut Packet as *mut u8, mem::size_of::()) as &mut [u8] + slice::from_raw_parts_mut( + self as *mut Packet as *mut u8, + mem::size_of::() + ) as &mut [u8] } } } @@ -107,8 +119,10 @@ impl Deref for Stat { type Target = [u8]; fn deref(&self) -> &[u8] { unsafe { - slice::from_raw_parts(self as *const Stat as *const u8, - mem::size_of::()) as &[u8] + slice::from_raw_parts( + self as *const Stat as *const u8, + mem::size_of::() + ) as &[u8] } } } @@ -116,8 +130,10 @@ impl Deref for Stat { impl DerefMut for Stat { fn deref_mut(&mut self) -> &mut [u8] { unsafe { - slice::from_raw_parts_mut(self as *mut Stat as *mut u8, - mem::size_of::()) as &mut [u8] + slice::from_raw_parts_mut( + self as *mut Stat as *mut u8, + mem::size_of::() + ) as &mut [u8] } } } @@ -135,8 +151,10 @@ impl Deref for StatVfs { type Target = [u8]; fn deref(&self) -> &[u8] { unsafe { - slice::from_raw_parts(self as *const StatVfs as *const u8, - mem::size_of::()) as &[u8] + slice::from_raw_parts( + self as *const StatVfs as *const u8, + mem::size_of::() + ) as &[u8] } } } @@ -144,8 +162,10 @@ impl Deref for StatVfs { impl DerefMut for StatVfs { fn deref_mut(&mut self) -> &mut [u8] { unsafe { - slice::from_raw_parts_mut(self as *mut StatVfs as *mut u8, - mem::size_of::()) as &mut [u8] + slice::from_raw_parts_mut( + self as *mut StatVfs as *mut u8, + mem::size_of::() + ) as &mut [u8] } } } @@ -161,8 +181,10 @@ impl Deref for TimeSpec { type Target = [u8]; fn deref(&self) -> &[u8] { unsafe { - slice::from_raw_parts(self as *const TimeSpec as *const u8, - mem::size_of::()) as &[u8] + slice::from_raw_parts( + self as *const TimeSpec as *const u8, + mem::size_of::() + ) as &[u8] } } } @@ -170,8 +192,10 @@ impl Deref for TimeSpec { impl DerefMut for TimeSpec { fn deref_mut(&mut self) -> &mut [u8] { unsafe { - slice::from_raw_parts_mut(self as *mut TimeSpec as *mut u8, - mem::size_of::()) as &mut [u8] + slice::from_raw_parts_mut( + self as *mut TimeSpec as *mut u8, + mem::size_of::() + ) as &mut [u8] } } }