Rollup merge of rust-lang#85439 - mgacek8:add_diagnostic_item_to_CStr_type, r=davidtwco

Dylan-DPC · web-flow · commit 4e4094efc120 · 2021-05-19T22:09:58.000+02:00
Add diagnostic item to `CStr` Required for clippy issue: rust-lang/rust-clippy#7145
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
@@ -132,6 +132,7 @@ symbols! {
         Borrow,
         Break,
         C,
+        CStr,
         CString,
         Center,
         Clone,
diff --git a/library/std/src/ffi/c_str.rs b/library/std/src/ffi/c_str.rs
@@ -185,6 +185,7 @@ pub struct CString {
 ///
 /// [`&str`]: prim@str
 #[derive(Hash)]
+#[cfg_attr(not(test), rustc_diagnostic_item = "CStr")]
 #[stable(feature = "rust1", since = "1.0.0")]
 // FIXME:
 // `fn from` in `impl From<&CStr> for Box<CStr>` current implementation relies

-Original file line number
+Diff line change
         Borrow,
         Break,
         C,
 +        CStr,
         CString,
         Center,
         Clone,