Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions library/std/src/thread/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,15 @@ impl Builder {
/// [`io::Result`] to capture any failure to create the thread at
/// the OS level.
///
/// [`io::Result`]: crate::io::Result
/// Like [`spawn`], this method will still call the main thread functions
/// added by [`add_spawn_hook`] (unless [`Builder::no_hooks`] was called),
/// but won't execute the returned functions if thread creation fails at the
/// OS level.
///
/// # Panics
///
/// Panics if a thread name was set and it contained null bytes.
/// Panics if a thread name was set and it contained null bytes. In that case,
/// functions added by [`add_spawn_hook`] won't be called.
///
/// # Examples
///
Expand All @@ -181,8 +185,10 @@ impl Builder {
/// handler.join().unwrap();
/// ```
///
/// [`io::Result`]: crate::io::Result
/// [`thread::spawn`]: super::spawn
/// [`spawn`]: super::spawn
/// [`add_spawn_hook`]: crate::thread::add_spawn_hook
#[stable(feature = "rust1", since = "1.0.0")]
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
pub fn spawn<F, T>(self, f: F) -> io::Result<JoinHandle<T>>
Expand Down Expand Up @@ -212,9 +218,15 @@ impl Builder {
/// [`io::Result`] to capture any failure to create the thread at
/// the OS level.
///
/// Like [`spawn`], this method will still call the main thread functions
/// added by [`add_spawn_hook`] (unless [`Builder::no_hooks`] was called),
/// but won't execute the returned functions if thread creation fails at the
/// OS level.
///
/// # Panics
///
/// Panics if a thread name was set and it contained null bytes.
/// Panics if a thread name was set and it contained null bytes. In that case,
/// functions added by [`add_spawn_hook`] won't be called.
///
/// # Safety
///
Expand Down Expand Up @@ -253,6 +265,7 @@ impl Builder {
/// [`io::Result`]: crate::io::Result
/// [`thread::spawn`]: super::spawn
/// [`spawn`]: super::spawn
/// [`add_spawn_hook`]: crate::thread::add_spawn_hook
#[stable(feature = "thread_spawn_unchecked", since = "1.82.0")]
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
pub unsafe fn spawn_unchecked<F, T>(self, f: F) -> io::Result<JoinHandle<T>>
Expand Down
8 changes: 6 additions & 2 deletions library/std/src/thread/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ use crate::{io, panicking};
///
/// # Panics
///
/// Panics if the OS fails to create a thread; use [`Builder::spawn`]
/// to recover from such errors.
/// Panics if the OS fails to create a thread; use [`Builder::spawn`] to recover
/// from such errors.
///
/// If functions were added via [`add_spawn_hook`], they will still be called in
/// the parent thread, but the returned functions will not be executed.
///
/// # Examples
///
Expand Down Expand Up @@ -120,6 +123,7 @@ use crate::{io, panicking};
/// [`channels`]: crate::sync::mpsc
/// [`join`]: JoinHandle::join
/// [`Err`]: crate::result::Result::Err
/// [`add_spawn_hook`]: crate::thread::add_spawn_hook
#[stable(feature = "rust1", since = "1.0.0")]
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
pub fn spawn<F, T>(f: F) -> JoinHandle<T>
Expand Down
15 changes: 13 additions & 2 deletions library/std/src/thread/scoped.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,11 @@ impl<'scope, 'env> Scope<'scope, 'env> {
/// Panics if the OS fails to create a thread; use [`Builder::spawn_scoped`]
/// to recover from such errors.
///
/// If functions were added via [`add_spawn_hook`], they will still be called in
/// the parent thread, but the returned functions will not be executed.
///
/// [`join`]: ScopedJoinHandle::join
/// [`add_spawn_hook`]: crate::thread::add_spawn_hook
#[stable(feature = "scoped_threads", since = "1.63.0")]
pub fn spawn<F, T>(&'scope self, f: F) -> ScopedJoinHandle<'scope, T>
where
Expand All @@ -210,11 +214,15 @@ impl Builder {
/// Unlike [`Scope::spawn`], this method yields an [`io::Result`] to
/// capture any failure to create the thread at the OS level.
///
/// [`io::Result`]: crate::io::Result
/// Like [`Scope::spawn`], this method will still call the main thread functions
/// added by [`add_spawn_hook`] (unless [`Builder::no_hooks`] was called),
/// but won't execute the returned functions if thread creation fails at the
/// OS level.
///
/// # Panics
///
/// Panics if a thread name was set and it contained null bytes.
/// Panics if a thread name was set and it contained null bytes. In that case,
/// functions added by [`add_spawn_hook`] won't be called.
///
/// # Example
///
Expand Down Expand Up @@ -251,6 +259,9 @@ impl Builder {
/// a.push(4);
/// assert_eq!(x, a.len());
/// ```
///
/// [`io::Result`]: crate::io::Result
/// [`add_spawn_hook`]: crate::thread::add_spawn_hook
#[stable(feature = "scoped_threads", since = "1.63.0")]
pub fn spawn_scoped<'scope, 'env, F, T>(
self,
Expand Down
Loading