From c6bb62810ae226b35e0181d8c4efc6d0377d196d Mon Sep 17 00:00:00 2001
From: Andrea Nall <anall@andreanall.com>
Date: Mon, 15 Feb 2021 22:58:03 +0000
Subject: [PATCH] requested/proposed changes

---
 compiler/rustc_span/src/symbol.rs | 7 +++----
 library/alloc/src/borrow.rs       | 2 +-
 library/alloc/src/slice.rs        | 2 +-
 library/std/src/ffi/os_str.rs     | 2 +-
 library/std/src/path.rs           | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
index de6210d1893..83b13e7d93c 100644
--- a/compiler/rustc_span/src/symbol.rs
+++ b/compiler/rustc_span/src/symbol.rs
@@ -169,10 +169,12 @@ symbols! {
         Option,
         Ord,
         Ordering,
+        OsString,
         Output,
         Param,
         PartialEq,
         PartialOrd,
+        PathBuf,
         Pending,
         Pin,
         Poll,
@@ -198,6 +200,7 @@ symbols! {
         StructuralPartialEq,
         Sync,
         Target,
+        ToOwned,
         Try,
         Ty,
         TyCtxt,
@@ -796,7 +799,6 @@ symbols! {
         options,
         or,
         or_patterns,
-        os_string_type,
         other,
         out,
         overlapping_marker_traits,
@@ -825,7 +827,6 @@ symbols! {
         pat2018,
         pat2021,
         path,
-        path_buf_type,
         pattern_parentheses,
         phantom_data,
         pin,
@@ -1086,7 +1087,6 @@ symbols! {
         slice,
         slice_alloc,
         slice_patterns,
-        slice_to_vec_method,
         slice_u8,
         slice_u8_alloc,
         slicing_syntax,
@@ -1162,7 +1162,6 @@ symbols! {
         then_with,
         thread,
         thread_local,
-        to_owned_trait,
         tool_attributes,
         tool_lints,
         trace_macros,
diff --git a/library/alloc/src/borrow.rs b/library/alloc/src/borrow.rs
index 2fa349e3a4f..cec32251819 100644
--- a/library/alloc/src/borrow.rs
+++ b/library/alloc/src/borrow.rs
@@ -32,7 +32,7 @@ where
 /// to `T`. The `ToOwned` trait generalizes `Clone` to construct owned data
 /// from any borrow of a given type.
 #[stable(feature = "rust1", since = "1.0.0")]
-#[cfg_attr(not(test), rustc_diagnostic_item = "to_owned_trait")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "ToOwned")]
 pub trait ToOwned {
     /// The resulting type after obtaining ownership.
     #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/library/alloc/src/slice.rs b/library/alloc/src/slice.rs
index f8cc6a45877..839f742f1af 100644
--- a/library/alloc/src/slice.rs
+++ b/library/alloc/src/slice.rs
@@ -220,6 +220,7 @@ mod hack {
 }
 
 #[lang = "slice_alloc"]
+#[cfg_attr(not(test), rustc_diagnostic_item = "slice")]
 #[cfg(not(test))]
 impl<T> [T] {
     /// Sorts the slice.
@@ -442,7 +443,6 @@ impl<T> [T] {
     /// // Here, `s` and `x` can be modified independently.
     /// ```
     #[rustc_conversion_suggestion]
-    #[rustc_diagnostic_item = "slice_to_vec_method"]
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn to_vec(&self) -> Vec<T>
diff --git a/library/std/src/ffi/os_str.rs b/library/std/src/ffi/os_str.rs
index c1629d8b8f9..6af5adf4cd8 100644
--- a/library/std/src/ffi/os_str.rs
+++ b/library/std/src/ffi/os_str.rs
@@ -71,7 +71,7 @@ use crate::sys_common::{AsInner, FromInner, IntoInner};
 /// [`CStr`]: crate::ffi::CStr
 /// [conversions]: super#conversions
 #[derive(Clone)]
-#[cfg_attr(not(test), rustc_diagnostic_item = "os_string_type")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "OsString")]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct OsString {
     inner: Buf,
diff --git a/library/std/src/path.rs b/library/std/src/path.rs
index 66135a719be..759b233c7c1 100644
--- a/library/std/src/path.rs
+++ b/library/std/src/path.rs
@@ -1066,7 +1066,7 @@ impl FusedIterator for Ancestors<'_> {}
 ///
 /// Which method works best depends on what kind of situation you're in.
 #[derive(Clone)]
-#[cfg_attr(not(test), rustc_diagnostic_item = "path_buf_type")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "PathBuf")]
 #[stable(feature = "rust1", since = "1.0.0")]
 // FIXME:
 // `PathBuf::as_mut_vec` current implementation relies