Skip to content

Commit dbc026d

Browse files
committed
Rollup merge of #22545 - Ryman:fucntion, r=dotdash
2 parents 404724b + 6172986 commit dbc026d

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/libstd/thread.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -465,16 +465,16 @@ impl Thread {
465465
}
466466
}
467467

468-
/// Deprecated: use module-level free fucntion.
469-
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")]
468+
/// Deprecated: use module-level free function.
469+
#[deprecated(since = "1.0.0", reason = "use module-level free function")]
470470
#[unstable(feature = "std_misc",
471471
reason = "may change with specifics of new Send semantics")]
472472
pub fn spawn<F>(f: F) -> Thread where F: FnOnce(), F: Send + 'static {
473473
Builder::new().spawn(f).unwrap().thread().clone()
474474
}
475475

476-
/// Deprecated: use module-level free fucntion.
477-
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")]
476+
/// Deprecated: use module-level free function.
477+
#[deprecated(since = "1.0.0", reason = "use module-level free function")]
478478
#[unstable(feature = "std_misc",
479479
reason = "may change with specifics of new Send semantics")]
480480
pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where
@@ -483,30 +483,30 @@ impl Thread {
483483
Builder::new().scoped(f).unwrap()
484484
}
485485

486-
/// Deprecated: use module-level free fucntion.
487-
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")]
486+
/// Deprecated: use module-level free function.
487+
#[deprecated(since = "1.0.0", reason = "use module-level free function")]
488488
#[stable(feature = "rust1", since = "1.0.0")]
489489
pub fn current() -> Thread {
490490
thread_info::current_thread()
491491
}
492492

493-
/// Deprecated: use module-level free fucntion.
494-
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")]
493+
/// Deprecated: use module-level free function.
494+
#[deprecated(since = "1.0.0", reason = "use module-level free function")]
495495
#[unstable(feature = "std_misc", reason = "name may change")]
496496
pub fn yield_now() {
497497
unsafe { imp::yield_now() }
498498
}
499499

500-
/// Deprecated: use module-level free fucntion.
501-
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")]
500+
/// Deprecated: use module-level free function.
501+
#[deprecated(since = "1.0.0", reason = "use module-level free function")]
502502
#[inline]
503503
#[stable(feature = "rust1", since = "1.0.0")]
504504
pub fn panicking() -> bool {
505505
unwind::panicking()
506506
}
507507

508-
/// Deprecated: use module-level free fucntion.
509-
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")]
508+
/// Deprecated: use module-level free function.
509+
#[deprecated(since = "1.0.0", reason = "use module-level free function")]
510510
#[unstable(feature = "std_misc", reason = "recently introduced")]
511511
pub fn park() {
512512
let thread = current();
@@ -517,8 +517,8 @@ impl Thread {
517517
*guard = false;
518518
}
519519

520-
/// Deprecated: use module-level free fucntion.
521-
#[deprecated(since = "1.0.0", reason = "use module-level free fucntion")]
520+
/// Deprecated: use module-level free function.
521+
#[deprecated(since = "1.0.0", reason = "use module-level free function")]
522522
#[unstable(feature = "std_misc", reason = "recently introduced")]
523523
pub fn park_timeout(dur: Duration) {
524524
let thread = current();

0 commit comments

Comments
 (0)