Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tidy checks
  • Loading branch information
jackpot51 committed Sep 12, 2017
commit 914853bbfa912c4a49379997c0dc938801aa9c4e
6 changes: 4 additions & 2 deletions src/libstd/sys/redox/syscall/call.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ pub fn ftruncate(fd: usize, len: usize) -> Result<usize> {

// Change modify and/or access times
pub fn futimens(fd: usize, times: &[TimeSpec]) -> Result<usize> {
unsafe { syscall3(SYS_FUTIMENS, fd, times.as_ptr() as usize, times.len() * mem::size_of::<TimeSpec>()) }
unsafe { syscall3(SYS_FUTIMENS, fd, times.as_ptr() as usize,
times.len() * mem::size_of::<TimeSpec>()) }
}

/// Fast userspace mutex
Expand Down Expand Up @@ -291,7 +292,8 @@ pub fn setreuid(ruid: usize, euid: usize) -> Result<usize> {
}

/// Set up a signal handler
pub fn sigaction(sig: usize, act: Option<&SigAction>, oldact: Option<&mut SigAction>) -> Result<usize> {
pub fn sigaction(sig: usize, act: Option<&SigAction>, oldact: Option<&mut SigAction>)
-> Result<usize> {
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,
Expand Down
56 changes: 40 additions & 16 deletions src/libstd/sys/redox/syscall/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,21 @@ 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::<Event>()) as &[u8]
slice::from_raw_parts(
self as *const Event as *const u8,
mem::size_of::<Event>()
) as &[u8]
}
}
}

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::<Event>()) as &mut [u8]
slice::from_raw_parts_mut(
self as *mut Event as *mut u8,
mem::size_of::<Event>()
) as &mut [u8]
}
}
}
Expand All @@ -52,15 +58,21 @@ 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::<Packet>()) as &[u8]
slice::from_raw_parts(
self as *const Packet as *const u8,
mem::size_of::<Packet>()
) as &[u8]
}
}
}

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::<Packet>()) as &mut [u8]
slice::from_raw_parts_mut(
self as *mut Packet as *mut u8,
mem::size_of::<Packet>()
) as &mut [u8]
}
}
}
Expand Down Expand Up @@ -107,17 +119,21 @@ 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::<Stat>()) as &[u8]
slice::from_raw_parts(
self as *const Stat as *const u8,
mem::size_of::<Stat>()
) as &[u8]
}
}
}

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::<Stat>()) as &mut [u8]
slice::from_raw_parts_mut(
self as *mut Stat as *mut u8,
mem::size_of::<Stat>()
) as &mut [u8]
}
}
}
Expand All @@ -135,17 +151,21 @@ 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::<StatVfs>()) as &[u8]
slice::from_raw_parts(
self as *const StatVfs as *const u8,
mem::size_of::<StatVfs>()
) as &[u8]
}
}
}

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::<StatVfs>()) as &mut [u8]
slice::from_raw_parts_mut(
self as *mut StatVfs as *mut u8,
mem::size_of::<StatVfs>()
) as &mut [u8]
}
}
}
Expand All @@ -161,17 +181,21 @@ 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::<TimeSpec>()) as &[u8]
slice::from_raw_parts(
self as *const TimeSpec as *const u8,
mem::size_of::<TimeSpec>()
) as &[u8]
}
}
}

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::<TimeSpec>()) as &mut [u8]
slice::from_raw_parts_mut(
self as *mut TimeSpec as *mut u8,
mem::size_of::<TimeSpec>()
) as &mut [u8]
}
}
}