Rollup merge of #22545 - Ryman:fucntion, r=dotdash

This commit is contained in:
Manish Goregaokar
2015-02-22 01:47:41 +05:30

View File

@@ -465,16 +465,16 @@ impl Thread {
} }
} }
/// Deprecated: use module-level free fucntion. /// Deprecated: use module-level free function.
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")] #[deprecated(since = "1.0.0", reason = "use module-level free function")]
#[unstable(feature = "std_misc", #[unstable(feature = "std_misc",
reason = "may change with specifics of new Send semantics")] reason = "may change with specifics of new Send semantics")]
pub fn spawn<F>(f: F) -> Thread where F: FnOnce(), F: Send + 'static { pub fn spawn<F>(f: F) -> Thread where F: FnOnce(), F: Send + 'static {
Builder::new().spawn(f).unwrap().thread().clone() Builder::new().spawn(f).unwrap().thread().clone()
} }
/// Deprecated: use module-level free fucntion. /// Deprecated: use module-level free function.
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")] #[deprecated(since = "1.0.0", reason = "use module-level free function")]
#[unstable(feature = "std_misc", #[unstable(feature = "std_misc",
reason = "may change with specifics of new Send semantics")] reason = "may change with specifics of new Send semantics")]
pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where
@@ -483,30 +483,30 @@ impl Thread {
Builder::new().scoped(f).unwrap() Builder::new().scoped(f).unwrap()
} }
/// Deprecated: use module-level free fucntion. /// Deprecated: use module-level free function.
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")] #[deprecated(since = "1.0.0", reason = "use module-level free function")]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn current() -> Thread { pub fn current() -> Thread {
thread_info::current_thread() thread_info::current_thread()
} }
/// Deprecated: use module-level free fucntion. /// Deprecated: use module-level free function.
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")] #[deprecated(since = "1.0.0", reason = "use module-level free function")]
#[unstable(feature = "std_misc", reason = "name may change")] #[unstable(feature = "std_misc", reason = "name may change")]
pub fn yield_now() { pub fn yield_now() {
unsafe { imp::yield_now() } unsafe { imp::yield_now() }
} }
/// Deprecated: use module-level free fucntion. /// Deprecated: use module-level free function.
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")] #[deprecated(since = "1.0.0", reason = "use module-level free function")]
#[inline] #[inline]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn panicking() -> bool { pub fn panicking() -> bool {
unwind::panicking() unwind::panicking()
} }
/// Deprecated: use module-level free fucntion. /// Deprecated: use module-level free function.
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")] #[deprecated(since = "1.0.0", reason = "use module-level free function")]
#[unstable(feature = "std_misc", reason = "recently introduced")] #[unstable(feature = "std_misc", reason = "recently introduced")]
pub fn park() { pub fn park() {
let thread = current(); let thread = current();
@@ -517,8 +517,8 @@ impl Thread {
*guard = false; *guard = false;
} }
/// Deprecated: use module-level free fucntion. /// Deprecated: use module-level free function.
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")] #[deprecated(since = "1.0.0", reason = "use module-level free function")]
#[unstable(feature = "std_misc", reason = "recently introduced")] #[unstable(feature = "std_misc", reason = "recently introduced")]
pub fn park_timeout(dur: Duration) { pub fn park_timeout(dur: Duration) {
let thread = current(); let thread = current();