about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-04-11 19:05:26 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-04-11 19:05:26 +0530
commitf52682630e7eecfb46381bde2bab7a938ba0c8c5 (patch)
tree0dc11f6fe375ebf436ad2e942ac95f2343532e64 /src/libstd/thread
parent1e3fd25b6b21acabe3d531dd0f76950931a13e8d (diff)
parent7bf1da1283874e0e968e76e95d2168c1624c2ce2 (diff)
downloadrust-f52682630e7eecfb46381bde2bab7a938ba0c8c5.tar.gz
rust-f52682630e7eecfb46381bde2bab7a938ba0c8c5.zip
Rollup merge of #24283 - apasel422:patch-2, r=alexcrichton
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index 10c79671c0c..f893ae243bb 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -367,7 +367,7 @@ impl Builder {
 ///
 /// # 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.
 #[stable(feature = "rust1", since = "1.0.0")]
 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
 ///
-/// 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.
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where