Rollup merge of #24283 - apasel422:patch-2, r=alexcrichton

This commit is contained in:
Manish Goregaokar 2015-04-11 19:05:26 +05:30
commit f52682630e

View File

@ -367,7 +367,7 @@ impl Builder {
/// ///
/// # Panics /// # Panics
/// ///
/// Panicks if the OS fails to create a thread; use `Builder::spawn` /// Panics if the OS fails to create a thread; use `Builder::spawn`
/// to recover from such errors. /// to recover from such errors.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn spawn<F>(f: F) -> JoinHandle where F: FnOnce(), F: Send + 'static { pub fn spawn<F>(f: F) -> JoinHandle where F: FnOnce(), F: Send + 'static {
@ -385,7 +385,7 @@ pub fn spawn<F>(f: F) -> JoinHandle where F: FnOnce(), F: Send + 'static {
/// ///
/// # Panics /// # Panics
/// ///
/// Panicks if the OS fails to create a thread; use `Builder::scoped` /// Panics if the OS fails to create a thread; use `Builder::scoped`
/// to recover from such errors. /// to recover from such errors.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where