diff options
| author | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2019-10-06 15:53:26 +0000 |
|---|---|---|
| committer | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2019-10-06 15:53:26 +0000 |
| commit | 82f40c4b9b93473f4ec3b102a9c2dde8f4b6da19 (patch) | |
| tree | 0436ff396a5c37b569622bd6ee31d2644eb85abb /src/libstd/sys | |
| parent | c1e440a90f472468c8069ba6254b23c6feedc32e (diff) | |
| download | rust-82f40c4b9b93473f4ec3b102a9c2dde8f4b6da19.tar.gz rust-82f40c4b9b93473f4ec3b102a9c2dde8f4b6da19.zip | |
minor changes to follow the Rust's style guidelines
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/hermit/fs.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/hermit/mod.rs | 5 | ||||
| -rw-r--r-- | src/libstd/sys/hermit/thread.rs | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/libstd/sys/hermit/fs.rs b/src/libstd/sys/hermit/fs.rs index 2cec93e3e5e..3616249ca81 100644 --- a/src/libstd/sys/hermit/fs.rs +++ b/src/libstd/sys/hermit/fs.rs @@ -226,7 +226,9 @@ impl OpenOptions { (true, true, false) => Ok(O_RDWR), (false, _, true) => Ok(O_WRONLY | O_APPEND), (true, _, true) => Ok(O_RDWR | O_APPEND), - (false, false, false) => Err(io::Error::new(ErrorKind::InvalidInput, "invalid access mode")), + (false, false, false) => { + Err(io::Error::new(ErrorKind::InvalidInput, "invalid access mode")) + }, } } diff --git a/src/libstd/sys/hermit/mod.rs b/src/libstd/sys/hermit/mod.rs index c413b3e5323..929fcdb4548 100644 --- a/src/libstd/sys/hermit/mod.rs +++ b/src/libstd/sys/hermit/mod.rs @@ -81,7 +81,7 @@ pub unsafe fn abort_internal() -> ! { sys_abort(); } -// TODO: just a workaround to test the system +// FIXME: just a workaround to test the system pub fn hashmap_random_keys() -> (u64, u64) { (1, 2) } @@ -104,7 +104,8 @@ pub fn init() { #[cfg(not(test))] #[no_mangle] -pub unsafe extern "C" fn runtime_entry(argc: i32, argv: *const *const c_char, env: *const *const c_char) -> ! { +pub unsafe extern "C" fn runtime_entry(argc: i32, argv: *const *const c_char, + env: *const *const c_char) -> ! { extern "C" { fn main(argc: isize, argv: *const *const c_char) -> i32; fn sys_exit(arg: i32) ->!; diff --git a/src/libstd/sys/hermit/thread.rs b/src/libstd/sys/hermit/thread.rs index cb5ed2963b1..7e934c9ccdb 100644 --- a/src/libstd/sys/hermit/thread.rs +++ b/src/libstd/sys/hermit/thread.rs @@ -35,7 +35,8 @@ pub const NORMAL_PRIO: Priority = Priority::from(2); extern "C" { fn sys_usleep(usecs: u64); - fn sys_spawn(id: *mut Tid, func: extern "C" fn(usize), arg: usize, prio: u8, core_id: isize) -> i32; + fn sys_spawn(id: *mut Tid, func: extern "C" fn(usize), + arg: usize, prio: u8, core_id: isize) -> i32; fn sys_join(id: Tid) -> i32; fn sys_yield(); } @@ -55,7 +56,8 @@ impl Thread { { let p = box p; let mut tid: Tid = u32::MAX; - let ret = sys_spawn(&mut tid as *mut Tid, thread_start, &*p as *const _ as *const u8 as usize, + let ret = sys_spawn(&mut tid as *mut Tid, thread_start, + &*p as *const _ as *const u8 as usize, Priority::into(NORMAL_PRIO), core_id); return if ret == 0 { |