Skip to content

Commit 914853b

Browse files
committed
Fix tidy checks
1 parent e2820ea commit 914853b

File tree

2 files changed

+44
-18
lines changed

2 files changed

+44
-18
lines changed

src/libstd/sys/redox/syscall/call.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ pub fn ftruncate(fd: usize, len: usize) -> Result<usize> {
140140

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

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

293294
/// Set up a signal handler
294-
pub fn sigaction(sig: usize, act: Option<&SigAction>, oldact: Option<&mut SigAction>) -> Result<usize> {
295+
pub fn sigaction(sig: usize, act: Option<&SigAction>, oldact: Option<&mut SigAction>)
296+
-> Result<usize> {
295297
unsafe { syscall4(SYS_SIGACTION, sig,
296298
act.map(|x| x as *const _).unwrap_or_else(ptr::null) as usize,
297299
oldact.map(|x| x as *mut _).unwrap_or_else(ptr::null_mut) as usize,

src/libstd/sys/redox/syscall/data.rs

+40-16
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,21 @@ impl Deref for Event {
2222
type Target = [u8];
2323
fn deref(&self) -> &[u8] {
2424
unsafe {
25-
slice::from_raw_parts(self as *const Event as *const u8, mem::size_of::<Event>()) as &[u8]
25+
slice::from_raw_parts(
26+
self as *const Event as *const u8,
27+
mem::size_of::<Event>()
28+
) as &[u8]
2629
}
2730
}
2831
}
2932

3033
impl DerefMut for Event {
3134
fn deref_mut(&mut self) -> &mut [u8] {
3235
unsafe {
33-
slice::from_raw_parts_mut(self as *mut Event as *mut u8, mem::size_of::<Event>()) as &mut [u8]
36+
slice::from_raw_parts_mut(
37+
self as *mut Event as *mut u8,
38+
mem::size_of::<Event>()
39+
) as &mut [u8]
3440
}
3541
}
3642
}
@@ -52,15 +58,21 @@ impl Deref for Packet {
5258
type Target = [u8];
5359
fn deref(&self) -> &[u8] {
5460
unsafe {
55-
slice::from_raw_parts(self as *const Packet as *const u8, mem::size_of::<Packet>()) as &[u8]
61+
slice::from_raw_parts(
62+
self as *const Packet as *const u8,
63+
mem::size_of::<Packet>()
64+
) as &[u8]
5665
}
5766
}
5867
}
5968

6069
impl DerefMut for Packet {
6170
fn deref_mut(&mut self) -> &mut [u8] {
6271
unsafe {
63-
slice::from_raw_parts_mut(self as *mut Packet as *mut u8, mem::size_of::<Packet>()) as &mut [u8]
72+
slice::from_raw_parts_mut(
73+
self as *mut Packet as *mut u8,
74+
mem::size_of::<Packet>()
75+
) as &mut [u8]
6476
}
6577
}
6678
}
@@ -107,17 +119,21 @@ impl Deref for Stat {
107119
type Target = [u8];
108120
fn deref(&self) -> &[u8] {
109121
unsafe {
110-
slice::from_raw_parts(self as *const Stat as *const u8,
111-
mem::size_of::<Stat>()) as &[u8]
122+
slice::from_raw_parts(
123+
self as *const Stat as *const u8,
124+
mem::size_of::<Stat>()
125+
) as &[u8]
112126
}
113127
}
114128
}
115129

116130
impl DerefMut for Stat {
117131
fn deref_mut(&mut self) -> &mut [u8] {
118132
unsafe {
119-
slice::from_raw_parts_mut(self as *mut Stat as *mut u8,
120-
mem::size_of::<Stat>()) as &mut [u8]
133+
slice::from_raw_parts_mut(
134+
self as *mut Stat as *mut u8,
135+
mem::size_of::<Stat>()
136+
) as &mut [u8]
121137
}
122138
}
123139
}
@@ -135,17 +151,21 @@ impl Deref for StatVfs {
135151
type Target = [u8];
136152
fn deref(&self) -> &[u8] {
137153
unsafe {
138-
slice::from_raw_parts(self as *const StatVfs as *const u8,
139-
mem::size_of::<StatVfs>()) as &[u8]
154+
slice::from_raw_parts(
155+
self as *const StatVfs as *const u8,
156+
mem::size_of::<StatVfs>()
157+
) as &[u8]
140158
}
141159
}
142160
}
143161

144162
impl DerefMut for StatVfs {
145163
fn deref_mut(&mut self) -> &mut [u8] {
146164
unsafe {
147-
slice::from_raw_parts_mut(self as *mut StatVfs as *mut u8,
148-
mem::size_of::<StatVfs>()) as &mut [u8]
165+
slice::from_raw_parts_mut(
166+
self as *mut StatVfs as *mut u8,
167+
mem::size_of::<StatVfs>()
168+
) as &mut [u8]
149169
}
150170
}
151171
}
@@ -161,17 +181,21 @@ impl Deref for TimeSpec {
161181
type Target = [u8];
162182
fn deref(&self) -> &[u8] {
163183
unsafe {
164-
slice::from_raw_parts(self as *const TimeSpec as *const u8,
165-
mem::size_of::<TimeSpec>()) as &[u8]
184+
slice::from_raw_parts(
185+
self as *const TimeSpec as *const u8,
186+
mem::size_of::<TimeSpec>()
187+
) as &[u8]
166188
}
167189
}
168190
}
169191

170192
impl DerefMut for TimeSpec {
171193
fn deref_mut(&mut self) -> &mut [u8] {
172194
unsafe {
173-
slice::from_raw_parts_mut(self as *mut TimeSpec as *mut u8,
174-
mem::size_of::<TimeSpec>()) as &mut [u8]
195+
slice::from_raw_parts_mut(
196+
self as *mut TimeSpec as *mut u8,
197+
mem::size_of::<TimeSpec>()
198+
) as &mut [u8]
175199
}
176200
}
177201
}

0 commit comments

Comments
 (0)