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/libcore | |
| 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/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 2 | ||||
| -rw-r--r-- | src/libcore/option.rs | 2 | ||||
| -rw-r--r-- | src/libcore/result.rs | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 63688e70c45..615549f47bb 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -60,8 +60,8 @@ #![warn(deprecated_in_future)] #![warn(missing_docs)] -#![warn(intra_doc_link_resolution_failure)] #![warn(missing_debug_implementations)] +#![deny(intra_doc_link_resolution_failure)] // rustdoc is run without -D warnings #![feature(allow_internal_unstable)] #![feature(arbitrary_self_types)] diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 3da92c0a05a..68ef087d84b 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -178,6 +178,7 @@ impl<T> Option<T> { /// ``` /// /// [`Some`]: #variant.Some + #[must_use] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn is_some(&self) -> bool { @@ -200,6 +201,7 @@ impl<T> Option<T> { /// ``` /// /// [`None`]: #variant.None + #[must_use] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn is_none(&self) -> bool { diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 9b7b8368986..e22a9ebbca4 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -277,6 +277,7 @@ impl<T, E> Result<T, E> { /// let x: Result<i32, &str> = Err("Some error message"); /// assert_eq!(x.is_ok(), false); /// ``` + #[must_use] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn is_ok(&self) -> bool { @@ -301,6 +302,7 @@ impl<T, E> Result<T, E> { /// let x: Result<i32, &str> = Err("Some error message"); /// assert_eq!(x.is_err(), true); /// ``` + #[must_use] #[inline] #[stable(feature = "rust1", since = "1.0.0")] pub fn is_err(&self) -> bool { |