about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-04-15 16:24:19 +0000
committerbors <bors@rust-lang.org>2019-04-15 16:24:19 +0000
commit07133ac70cca85b2f91aedb76a21ece524bc0cb4 (patch)
treecfebf7d3b0fee04927f6274b02d2a78d3c00bb62 /src/libstd/sync
parent9217fe0e2f04d61dd29c9aaebee2c993705e1d26 (diff)
parent6434fe9ef58fbb59b23fa9bc667d98fb5c91ab0f (diff)
downloadrust-07133ac70cca85b2f91aedb76a21ece524bc0cb4.tar.gz
rust-07133ac70cca85b2f91aedb76a21ece524bc0cb4.zip
Auto merge of #59991 - Centril:rollup-bqxt4w3, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #59648 (Add must_use annotations to Result::is_ok and is_err)
 - #59748 (Add summary and reference to Rust trademark guide)
 - #59779 (Uplift `get_def_path` from Clippy)
 - #59955 (bump stdsimd; make intra_doc_link_resolution_failure an error again; make lints more consistent)
 - #59978 (rustdoc: Remove default keyword from re-exported trait methods)
 - #59989 (Fix links to Atomic* in RELEASES.md)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index bc32b8e47b3..685c7909ff2 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -1005,7 +1005,7 @@ impl<T> SyncSender<T> {
     /// thread::spawn(move || {
     ///     // This will return an error and send
     ///     // no message if the buffer is full
-    ///     sync_sender2.try_send(3).is_err();
+    ///     let _ = sync_sender2.try_send(3);
     /// });
     ///
     /// let mut msg;