mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix coding style.

Browse Source
This commit is contained in:
Colin Finck 2018-07-31 09:49:10 +02:00
parent e50f4eeaad
commit 4ad4ad02eb
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/liballoc_system/lib.rs
View File

@ -174,7 +174,10 @@ mod platform {
} }
} }
#[cfg(any(target_os = "android", target_os = "hermit", target_os = "redox", target_os = "solaris"))] #[cfg(any(target_os = "android",
target_os = "hermit",
target_os = "redox",
target_os = "solaris"))]
#[inline] #[inline]
unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 { unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
// On android we currently target API level 9 which unfortunately // On android we currently target API level 9 which unfortunately
@ -197,7 +200,10 @@ mod platform {
libc::memalign(layout.align(), layout.size()) as *mut u8 libc::memalign(layout.align(), layout.size()) as *mut u8
} }
#[cfg(not(any(target_os = "android", target_os = "hermit", target_os = "redox", target_os = "solaris")))] #[cfg(not(any(target_os = "android",
target_os = "hermit",
target_os = "redox",
target_os = "solaris")))]
#[inline] #[inline]
unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 { unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
let mut out = ptr::null_mut(); let mut out = ptr::null_mut();

5
src/libstd/sys/unix/condvar.rs
View File

@ -85,7 +85,10 @@ impl Condvar {
// where we configure condition variable to use monotonic clock (instead of // where we configure condition variable to use monotonic clock (instead of
// default system clock). This approach avoids all problems that result // default system clock). This approach avoids all problems that result
// from changes made to the system time. // from changes made to the system time.
#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "android", target_os = "hermit")))] #[cfg(not(any(target_os = "macos",
target_os = "ios",
target_os = "android",
target_os = "hermit")))]
pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool { pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool {
use mem; use mem;