diff --git a/src/lib.rs b/src/lib.rs index c4c0fa53cc..476ea241a2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -205,7 +205,7 @@ pub type Result = result::Result; /// * `Eq` /// * Small size /// * Represents all of the system's errnos, instead of just the most common -/// ones. +/// ones. pub type Error = Errno; /// Common trait used to represent file system paths by many Nix functions. diff --git a/src/sched.rs b/src/sched.rs index d76d5581d1..617d00493f 100644 --- a/src/sched.rs +++ b/src/sched.rs @@ -120,7 +120,10 @@ mod sched_linux_like { let ptr = stack.as_mut_ptr().add(stack.len()); let ptr_aligned = ptr.sub(ptr as usize % 16); libc::clone( - mem::transmute( + mem::transmute::< + extern "C" fn(*mut Box isize>) -> i32, + extern "C" fn(*mut libc::c_void) -> i32, + >( callback as extern "C" fn(*mut Box isize>) -> i32, ), diff --git a/src/sys/timer.rs b/src/sys/timer.rs index e1a34051e8..8876f56972 100644 --- a/src/sys/timer.rs +++ b/src/sys/timer.rs @@ -95,7 +95,7 @@ impl Timer { /// There are 3 types of alarms you can set: /// /// - one shot: the alarm will trigger once after the specified amount of - /// time. + /// time. /// Example: I want an alarm to go off in 60s and then disable itself. /// /// - interval: the alarm will trigger every specified interval of time. diff --git a/src/sys/timerfd.rs b/src/sys/timerfd.rs index 68b06d6322..6a13c843e8 100644 --- a/src/sys/timerfd.rs +++ b/src/sys/timerfd.rs @@ -113,7 +113,7 @@ impl TimerFd { /// There are 3 types of alarms you can set: /// /// - one shot: the alarm will trigger once after the specified amount of - /// time. + /// time. /// Example: I want an alarm to go off in 60s and then disable itself. /// /// - interval: the alarm will trigger every specified interval of time.