From dc769fd977dc0d92cd5cc7a375b2cd02de18e549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hermann=20D=C3=B6ppes?= <hermannd.ouml.ppes@gmail.com>
Date: Wed, 4 Apr 2018 22:52:06 +0200
Subject: [PATCH] Run ./fmt.sh
---
build.rs | 5 +++--
src/stdlib/src/lib.rs | 2 +-
src/string/src/lib.rs | 24 ++++--------------------
src/sys_mman/src/redox.rs | 1 +
4 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/build.rs b/build.rs
index d87317ad..b4cef42a 100644
--- a/build.rs
+++ b/build.rs
@@ -7,8 +7,9 @@ fn main() {
cc::Build::new()
.flag("-nostdinc")
- .flag("-nostdlib")
- .flag("-I").flag(&format!("{}/include", crate_dir))
+ .flag("-nostdlib")
+ .flag("-I")
+ .flag(&format!("{}/include", crate_dir))
.flag("-fno-stack-protector")
.file("src/c/fcntl.c")
.file("src/c/stdio.c")
diff --git a/src/stdlib/src/lib.rs b/src/stdlib/src/lib.rs
index 4a1e7c96..55928ae4 100644
--- a/src/stdlib/src/lib.rs
+++ b/src/stdlib/src/lib.rs
@@ -333,7 +333,7 @@ pub unsafe extern "C" fn memalign(alignment: size_t, size: size_t) -> *mut c_voi
align *= 2;
}
- malloc_inner(size, align/2, align)
+ malloc_inner(size, align / 2, align)
}
#[no_mangle]
diff --git a/src/string/src/lib.rs b/src/string/src/lib.rs
index 80696ac8..cd57b63f 100644
--- a/src/string/src/lib.rs
+++ b/src/string/src/lib.rs
@@ -43,11 +43,7 @@ pub unsafe extern "C" fn memchr(s: *const c_void, c: c_int, n: usize) -> *mut c_
}
#[no_mangle]
-pub unsafe extern "C" fn memcmp(
- s1: *const c_void,
- s2: *const c_void,
- n: usize,
-) -> c_int {
+pub unsafe extern "C" fn memcmp(s1: *const c_void, s2: *const c_void, n: usize) -> c_int {
let mut i = 0;
while i < n {
let a = *(s1 as *const u8).offset(i as isize);
@@ -61,11 +57,7 @@ pub unsafe extern "C" fn memcmp(
}
#[no_mangle]
-pub unsafe extern "C" fn memcpy(
- s1: *mut c_void,
- s2: *const c_void,
- n: usize,
-) -> *mut c_void {
+pub unsafe extern "C" fn memcpy(s1: *mut c_void, s2: *const c_void, n: usize) -> *mut c_void {
let mut i = 0;
while i < n {
*(s1 as *mut u8).offset(i as isize) = *(s2 as *const u8).offset(i as isize);
@@ -75,11 +67,7 @@ pub unsafe extern "C" fn memcpy(
}
#[no_mangle]
-pub unsafe extern "C" fn memmove(
- s1: *mut c_void,
- s2: *const c_void,
- n: usize,
-) -> *mut c_void {
+pub unsafe extern "C" fn memmove(s1: *mut c_void, s2: *const c_void, n: usize) -> *mut c_void {
if s2 < s1 as *const c_void {
// copy from end
let mut i = n;
@@ -99,11 +87,7 @@ pub unsafe extern "C" fn memmove(
}
#[no_mangle]
-pub unsafe extern "C" fn memset(
- s: *mut c_void,
- c: c_int,
- n: usize,
-) -> *mut c_void {
+pub unsafe extern "C" fn memset(s: *mut c_void, c: c_int, n: usize) -> *mut c_void {
let mut i = 0;
while i < n {
*(s as *mut u8).offset(i as isize) = c as u8;
diff --git a/src/sys_mman/src/redox.rs b/src/sys_mman/src/redox.rs
index e69de29b..8b137891 100644
--- a/src/sys_mman/src/redox.rs
+++ b/src/sys_mman/src/redox.rs
@@ -0,0 +1 @@
+
--
GitLab