diff options
| author | bors <bors@rust-lang.org> | 2019-04-15 16:24:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-15 16:24:19 +0000 |
| commit | 07133ac70cca85b2f91aedb76a21ece524bc0cb4 (patch) | |
| tree | cfebf7d3b0fee04927f6274b02d2a78d3c00bb62 /src/libstd | |
| parent | 9217fe0e2f04d61dd29c9aaebee2c993705e1d26 (diff) | |
| parent | 6434fe9ef58fbb59b23fa9bc667d98fb5c91ab0f (diff) | |
| download | rust-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')
| -rw-r--r-- | src/libstd/lib.rs | 7 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index ee6ba3f438f..62bc1991cc9 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -205,9 +205,10 @@ // Don't link to std. We are std. #![no_std] -#![deny(missing_docs)] -#![deny(intra_doc_link_resolution_failure)] -#![deny(missing_debug_implementations)] +//#![warn(deprecated_in_future)] // FIXME: std still has quite a few uses of `mem::uninitialized` +#![warn(missing_docs)] +#![warn(missing_debug_implementations)] +#![deny(intra_doc_link_resolution_failure)] // rustdoc is run without -D warnings #![deny(rust_2018_idioms)] #![allow(explicit_outlives_requirements)] 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; |
