diff options
| author | bors <bors@rust-lang.org> | 2021-10-03 03:43:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-03 03:43:21 +0000 |
| commit | 77f1e504a953efbbd59673a75c3cd530d5b3c530 (patch) | |
| tree | ce5c40eb2daa3c4becdf424dbbd61a10ae040543 /library/alloc/src | |
| parent | c70b35efd8ed4d2e85a468c6519300c16609cdab (diff) | |
| parent | eec856bfbcd79d12352f81b44a9f04e5bb06bda5 (diff) | |
Auto merge of #89479 - camsteffen:diag-naming, r=Manishearth
Make diangostic item naming consistent Right now there is about a 50/50 split of naming diagnostic items as `vec_type` vs `Vec`. So it is hard to guess a diagnostic item name with confidence. I know it's not great to change these retroactively, but I think it will be much easier to maintain consistency after consistency is established.
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/collections/vec_deque/mod.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/string.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/library/alloc/src/collections/vec_deque/mod.rs b/library/alloc/src/collections/vec_deque/mod.rs index cae0f29af83..4a2b0b33bf2 100644 --- a/library/alloc/src/collections/vec_deque/mod.rs +++ b/library/alloc/src/collections/vec_deque/mod.rs @@ -88,7 +88,7 @@ const MAXIMUM_ZST_CAPACITY: usize = 1 << (usize::BITS - 1); // Largest possible /// [`extend`]: VecDeque::extend /// [`append`]: VecDeque::append /// [`make_contiguous`]: VecDeque::make_contiguous -#[cfg_attr(not(test), rustc_diagnostic_item = "vecdeque_type")] +#[cfg_attr(not(test), rustc_diagnostic_item = "VecDeque")] #[stable(feature = "rust1", since = "1.0.0")] #[rustc_insignificant_dtor] pub struct VecDeque< diff --git a/library/alloc/src/string.rs b/library/alloc/src/string.rs index 57c38f2c0a9..92a17cc75ef 100644 --- a/library/alloc/src/string.rs +++ b/library/alloc/src/string.rs @@ -289,7 +289,7 @@ use crate::vec::Vec; /// [`Deref`]: core::ops::Deref "ops::Deref" /// [`as_str()`]: String::as_str #[derive(PartialOrd, Eq, Ord)] -#[cfg_attr(not(test), rustc_diagnostic_item = "string_type")] +#[cfg_attr(not(test), rustc_diagnostic_item = "String")] #[stable(feature = "rust1", since = "1.0.0")] pub struct String { vec: Vec<u8>, diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 92b6aaadf58..bdfd40a952d 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -395,7 +395,7 @@ mod spec_extend; /// [`MaybeUninit`]: core::mem::MaybeUninit /// [owned slice]: Box #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(test), rustc_diagnostic_item = "vec_type")] +#[cfg_attr(not(test), rustc_diagnostic_item = "Vec")] #[rustc_insignificant_dtor] pub struct Vec<T, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global> { buf: RawVec<T, A>, |