From 7b8e7feb3dd562c507437c7e5b2200a7eff2d695 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 22 Jul 2018 11:33:01 +0200
Subject: [PATCH] Run fmt.sh
---
src/arpainet/src/lib.rs | 2 +-
src/stdlib/src/lib.rs | 38 ++++++++++++++++++++------------------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/arpainet/src/lib.rs b/src/arpainet/src/lib.rs
index c18452fd..b30372d9 100644
--- a/src/arpainet/src/lib.rs
+++ b/src/arpainet/src/lib.rs
@@ -129,4 +129,4 @@ pub extern "C" fn inet_netof(_in: in_addr) -> in_addr_t {
#[no_mangle]
pub extern "C" fn inet_network(cp: *const c_char) -> in_addr_t {
unimplemented!();
-}
\ No newline at end of file
+}
diff --git a/src/stdlib/src/lib.rs b/src/stdlib/src/lib.rs
index 8ff2dada..1c096323 100644
--- a/src/stdlib/src/lib.rs
+++ b/src/stdlib/src/lib.rs
@@ -401,7 +401,8 @@ pub unsafe extern "C" fn mbtowc(pwc: *mut wchar_t, s: *const c_char, n: size_t)
}
fn inner_mktemp<T, F>(name: *mut c_char, suffix_len: c_int, mut attempt: F) -> Option<T>
- where F: FnMut() -> Option<T>
+where
+ F: FnMut() -> Option<T>,
{
let len = unsafe { strlen(name) } as c_int;
@@ -421,10 +422,14 @@ fn inner_mktemp<T, F>(name: *mut c_char, suffix_len: c_int, mut attempt: F) -> O
rng.test_timer();
for _ in 0..100 {
- let char_iter = iter::repeat(()).map(|()| rng.sample(Alphanumeric)).take(6).enumerate();
+ let char_iter = iter::repeat(())
+ .map(|()| rng.sample(Alphanumeric))
+ .take(6)
+ .enumerate();
unsafe {
for (i, c) in char_iter {
- *name.offset((len as isize) - (suffix_len as isize) - (i as isize) - 1) = c as c_char
+ *name.offset((len as isize) - (suffix_len as isize) - (i as isize) - 1) =
+ c as c_char
}
}
@@ -433,27 +438,24 @@ fn inner_mktemp<T, F>(name: *mut c_char, suffix_len: c_int, mut attempt: F) -> O
}
}
- unsafe {
- platform::errno = errno::EEXIST
- }
+ unsafe { platform::errno = errno::EEXIST }
None
}
#[no_mangle]
pub extern "C" fn mktemp(name: *mut c_char) -> *mut c_char {
- if inner_mktemp(name, 0, || {
- unsafe {
- let mut st: stat = mem::uninitialized();
- let ret = if platform::stat(name, &mut st) != 0 && platform::errno == ENOENT {
- Some(())
- } else {
- None
- };
- mem::forget(st);
- ret
- }
- }).is_none() {
+ if inner_mktemp(name, 0, || unsafe {
+ let mut st: stat = mem::uninitialized();
+ let ret = if platform::stat(name, &mut st) != 0 && platform::errno == ENOENT {
+ Some(())
+ } else {
+ None
+ };
+ mem::forget(st);
+ ret
+ }).is_none()
+ {
unsafe {
*name = 0;
}
--
GitLab