diff options
author | kennytm <kennytm@gmail.com> | 2017-10-10 00:16:19 +0800 |
---|---|---|
committer | kennytm <kennytm@gmail.com> | 2017-10-10 00:27:16 +0800 |
commit | dad731cc80b97adf452d9ce8a02c0771a93cb1aa (patch) | |
tree | 2e29f072c7297f6e66cfb6840ef43c648c5666c0 | |
parent | d7acd29ad5a49f6123185502d8ca92822c477f55 (diff) | |
parent | b5b7666120658e332c1ea26e8bb3944aefde31ca (diff) | |
download | rust-dad731cc80b97adf452d9ce8a02c0771a93cb1aa.tar.gz |
Rollup merge of #44962 - shepmaster:no-ignore-result, r=steveklabnik
Don't encourage people to ignore threading errors in the docs
-rw-r--r-- | src/libstd/thread/mod.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 30887b16c60..07bbddc62b9 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -485,15 +485,17 @@ impl Builder { /// let (tx, rx) = channel(); /// /// let sender = thread::spawn(move || { -/// let _ = tx.send("Hello, thread".to_owned()); +/// tx.send("Hello, thread".to_owned()) +/// .expect("Unable to send on channel"); /// }); /// /// let receiver = thread::spawn(move || { -/// println!("{}", rx.recv().unwrap()); +/// let value = rx.recv().expect("Unable to receive from channel"); +/// println!("{}", value); /// }); /// -/// let _ = sender.join(); -/// let _ = receiver.join(); +/// sender.join().expect("The sender thread has panicked"); +/// receiver.join().expect("The receiver thread has panicked"); /// ``` /// /// A thread can also return a value through its [`JoinHandle`], you can use @@ -1192,7 +1194,7 @@ impl<T> JoinInner<T> { /// }); /// }); /// -/// let _ = original_thread.join(); +/// original_thread.join().expect("The thread being joined has panicked"); /// println!("Original thread is joined."); /// /// // We make sure that the new thread has time to run, before the main |