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/liballoc | |
| 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/liballoc')
| -rw-r--r-- | src/liballoc/collections/vec_deque.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/string.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index 091b068b0b2..a3b61f1f4a5 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -50,6 +50,7 @@ const MAXIMUM_ZST_CAPACITY: usize = 1 << (64 - 1); // Largest possible power of /// [`pop_front`]: #method.pop_front /// [`extend`]: #method.extend /// [`append`]: #method.append +#[cfg_attr(not(test), rustc_diagnostic_item = "vecdeque_type")] #[stable(feature = "rust1", since = "1.0.0")] pub struct VecDeque<T> { // tail and head are pointers into the buffer. Tail always points diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 80fa8139915..f3fe1adebb1 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -278,6 +278,7 @@ use crate::vec::Vec; /// [`Deref`]: ../../std/ops/trait.Deref.html /// [`as_str()`]: struct.String.html#method.as_str #[derive(PartialOrd, Eq, Ord)] +#[cfg_attr(not(test), rustc_diagnostic_item = "string_type")] #[stable(feature = "rust1", since = "1.0.0")] pub struct String { vec: Vec<u8>, |