diff options
| author | bors <bors@rust-lang.org> | 2020-04-22 11:14:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-22 11:14:23 +0000 |
| commit | 00f677d8974b393ff32ca25bf916b6b9650c75b0 (patch) | |
| tree | dfb7add749b25b2d432a93586814b00a28c45cfb /src/libstd | |
| parent | 4bfd62acb12a5e628d28950f9f94c3499216f10c (diff) | |
| parent | 01fdc885d6bd5ee9651fce930cc10d05dc274988 (diff) | |
| download | rust-00f677d8974b393ff32ca25bf916b6b9650c75b0.tar.gz rust-00f677d8974b393ff32ca25bf916b6b9650c75b0.zip | |
Auto merge of #71424 - Dylan-DPC:rollup-iunh61a, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #70970 (Detect mistyped associated consts in `Instance::resolve`.) - #71203 (Correct await span for async-await error reporting) - #71214 (Add error code for inner doc error) - #71337 (Moving all rustdoc-ui tests to check-pass) - #71412 (Clarify unused_doc_comments note on macro invocations) - #71414 (More diagnostic items for Clippy usage) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 1 | ||||
| -rw-r--r-- | src/libstd/collections/hash/set.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sync/mutex.rs | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index 706b388f783..e6da7426eb4 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -198,6 +198,7 @@ use crate::sys; /// ``` #[derive(Clone)] +#[cfg_attr(not(test), rustc_diagnostic_item = "hashmap_type")] #[stable(feature = "rust1", since = "1.0.0")] pub struct HashMap<K, V, S = RandomState> { base: base::HashMap<K, V, S>, diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 1ad99f03703..c1a57f2ce61 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -105,6 +105,7 @@ use super::map::{self, HashMap, Keys, RandomState}; /// [`PartialEq`]: ../../std/cmp/trait.PartialEq.html /// [`RefCell`]: ../../std/cell/struct.RefCell.html #[derive(Clone)] +#[cfg_attr(not(test), rustc_diagnostic_item = "hashset_type")] #[stable(feature = "rust1", since = "1.0.0")] pub struct HashSet<T, S = RandomState> { map: HashMap<T, (), S>, diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 0cb16b19d73..797b22fdd12 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -108,6 +108,7 @@ use crate::sys_common::poison::{self, LockResult, TryLockError, TryLockResult}; /// *guard += 1; /// ``` #[stable(feature = "rust1", since = "1.0.0")] +#[cfg_attr(not(test), rustc_diagnostic_item = "mutex_type")] pub struct Mutex<T: ?Sized> { // Note that this mutex is in a *box*, not inlined into the struct itself. // Once a native mutex has been used once, its address can never change (it |