address comments

Author: robertbastian

compiler/rustc_feature/src/unstable.rs

@@ -527,8 +527,6 @@ declare_features! (
     (unstable, import_trait_associated_functions, "CURRENT_RUSTC_VERSION", Some(134691)),
     /// Allows associated types in inherent impls.
     (incomplete, inherent_associated_types, "1.52.0", Some(8995)),
-    /// Adds `from_utf8*` functions as inherent methods on the `str` type.
-    (unstable, inherent_str_constructors, "1.82.0", Some(131114)),
     /// Allow anonymous constants from an inline `const` block in pattern position
     (unstable, inline_const_pat, "1.58.0", Some(76001)),
     /// Allows using `pointer` and `reference` in intra-doc links

compiler/rustc_span/src/symbol.rs

@@ -1110,7 +1110,6 @@ symbols! {
         infer_outlives_requirements,
         infer_static_outlives_requirements,
         inherent_associated_types,
-        inherent_str_constructors,
         inherit,
         inlateout,
         inline,

library/core/src/str/converts.rs

@@ -82,6 +82,7 @@ use crate::ptr;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_const_stable(feature = "const_str_from_utf8_shared", since = "1.63.0")]
+#[rustc_diagnostic_item = "str_from_utf8"]
 pub const fn from_utf8(v: &[u8]) -> Result<&str, Utf8Error> {
     str::from_utf8(v)
 }
@@ -118,15 +119,9 @@ pub const fn from_utf8(v: &[u8]) -> Result<&str, Utf8Error> {
 /// errors that can be returned.
 #[stable(feature = "str_mut_extras", since = "1.20.0")]
 #[rustc_const_unstable(feature = "const_str_from_utf8", issue = "91006")]
+#[rustc_diagnostic_item = "str_from_utf8_mut"]
 pub const fn from_utf8_mut(v: &mut [u8]) -> Result<&mut str, Utf8Error> {
-    // FIXME(const-hack): This should use `?` again, once it's `const`
-    match super::run_utf8_validation(v) {
-        Ok(_) => {
-            // SAFETY: validation succeeded.
-            Ok(unsafe { str::from_utf8_unchecked_mut(v) })
-        }
-        Err(err) => Err(err),
-    }
+    str::from_utf8_mut(v)
 }
 
 /// Converts a slice of bytes to a string slice without checking
@@ -158,6 +153,7 @@ pub const fn from_utf8_mut(v: &mut [u8]) -> Result<&mut str, Utf8Error> {
 #[must_use]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_const_stable(feature = "const_str_from_utf8_unchecked", since = "1.55.0")]
+#[rustc_diagnostic_item = "from_utf8_unchecked"]
 pub const unsafe fn from_utf8_unchecked(v: &[u8]) -> &str {
     // SAFETY: same requirements
     unsafe { str::from_utf8_unchecked(v) }
@@ -184,6 +180,7 @@ pub const unsafe fn from_utf8_unchecked(v: &[u8]) -> &str {
 #[must_use]
 #[stable(feature = "str_mut_extras", since = "1.20.0")]
 #[rustc_const_stable(feature = "const_str_from_utf8_unchecked_mut", since = "1.83.0")]
+#[rustc_diagnostic_item = "from_utf8_unchecked_mut"]
 pub const unsafe fn from_utf8_unchecked_mut(v: &mut [u8]) -> &mut str {
     // SAFETY: same requirements
     unsafe { str::from_utf8_unchecked_mut(v) }

library/core/src/str/mod.rs

@@ -233,9 +233,7 @@ impl str {
     /// assert_eq!("💖", sparkle_heart);
     /// ```
     #[unstable(feature = "inherent_str_constructors", issue = "131114")]
-    #[rustc_const_unstable(feature = "inherent_str_constructors", issue = "131114")]
     #[rustc_allow_const_fn_unstable(str_internals)]
-    #[rustc_diagnostic_item = "str_from_utf8"]
     pub const fn from_utf8(v: &[u8]) -> Result<&str, Utf8Error> {
         // FIXME(const-hack): This should use `?` again, once it's `const`
         match run_utf8_validation(v) {
@@ -278,8 +276,6 @@ impl str {
     /// See the docs for [`Utf8Error`] for more details on the kinds of
     /// errors that can be returned.
     #[unstable(feature = "inherent_str_constructors", issue = "131114")]
-    #[rustc_const_unstable(feature = "inherent_str_constructors", issue = "131114")]
-    #[rustc_diagnostic_item = "str_from_utf8_mut"]
     pub const fn from_utf8_mut(v: &mut [u8]) -> Result<&mut str, Utf8Error> {
         // FIXME(const-hack): This should use `?` again, once it's `const`
         match run_utf8_validation(v) {
@@ -319,8 +315,6 @@ impl str {
     #[inline]
     #[must_use]
     #[unstable(feature = "inherent_str_constructors", issue = "131114")]
-    #[rustc_const_unstable(feature = "inherent_str_constructors", issue = "131114")]
-    #[rustc_diagnostic_item = "str_from_utf8_unchecked"]
     pub const unsafe fn from_utf8_unchecked(v: &[u8]) -> &str {
         // SAFETY: the caller must guarantee that the bytes `v` are valid UTF-8.
         // Also relies on `&str` and `&[u8]` having the same layout.
@@ -347,8 +341,6 @@ impl str {
     #[inline]
     #[must_use]
     #[unstable(feature = "inherent_str_constructors", issue = "131114")]
-    #[rustc_const_unstable(feature = "inherent_str_constructors", issue = "131114")]
-    #[rustc_diagnostic_item = "str_from_utf8_unchecked_mut"]
     pub const unsafe fn from_utf8_unchecked_mut(v: &mut [u8]) -> &mut str {
         // SAFETY: the caller must guarantee that the bytes `v`
         // are valid UTF-8, thus the cast to `*mut str` is safe.