From a32fa442efe45fb9af7a5260b63ede856edc8e7f Mon Sep 17 00:00:00 2001
From: Mahdi Ali-Raihan <asder8215@gmail.com>
Date: Fri, 24 Jul 2026 12:55:03 -0400
Subject: [PATCH] Updated expect messages for CString struct and method
 documentation

---
 library/alloc/src/ffi/c_str.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/alloc/src/ffi/c_str.rs b/library/alloc/src/ffi/c_str.rs
index e6e6fcf5420f3..b340cf9566f2e 100644
--- a/library/alloc/src/ffi/c_str.rs
+++ b/library/alloc/src/ffi/c_str.rs
@@ -84,7 +84,7 @@ use crate::vec::Vec;
 ///
 /// // We are certain that our string doesn't have 0 bytes in the middle,
 /// // so we can .expect()
-/// let c_to_print = CString::new("Hello, world!").expect("CString::new failed");
+/// let c_to_print = CString::new("Hello, world!").expect("we provided a string without NUL bytes, so CString::new should not fail");
 /// unsafe {
 ///     my_printer(c_to_print.as_ptr());
 /// }
@@ -242,7 +242,7 @@ impl CString {
     ///
     /// extern "C" { fn puts(s: *const c_char); }
     ///
-    /// let to_print = CString::new("Hello!").expect("CString::new failed");
+    /// let to_print = CString::new("Hello!").expect("we provided a string without NUL bytes, so CString::new should not fail");
     /// unsafe {
     ///     puts(to_print.as_ptr());
     /// }
@@ -466,12 +466,12 @@ impl CString {
     /// use std::ffi::CString;
     ///
     /// let valid_utf8 = vec![b'f', b'o', b'o'];
-    /// let cstring = CString::new(valid_utf8).expect("CString::new failed");
-    /// assert_eq!(cstring.into_string().expect("into_string() call failed"), "foo");
+    /// let cstring = CString::new(valid_utf8).expect("we provided bytes that do not have a NUL byte, so CString::new should not fail");
+    /// assert_eq!(cstring.into_string().expect("we provided bytes that are valid UTF-8, so `into_string` should not fail"), "foo");
     ///
     /// let invalid_utf8 = vec![b'f', 0xff, b'o', b'o'];
-    /// let cstring = CString::new(invalid_utf8).expect("CString::new failed");
-    /// let err = cstring.into_string().err().expect("into_string().err() failed");
+    /// let cstring = CString::new(invalid_utf8).expect("we provided bytes that do not have a NUL byte, so CString::new should not fail");
+    /// let err = cstring.into_string().expect_err("we provided bytes that are invalid UTF-8, so `into_string` should fail");
     /// assert_eq!(err.utf8_error().valid_up_to(), 1);
     /// ```
     #[stable(feature = "cstring_into", since = "1.7.0")]
@@ -577,7 +577,7 @@ impl CString {
     /// let c_string = CString::from(c"foo");
     /// let cstr = c_string.as_c_str();
     /// assert_eq!(cstr,
-    ///            CStr::from_bytes_with_nul(b"foo\0").expect("CStr::from_bytes_with_nul failed"));
+    ///            CStr::from_bytes_with_nul(b"foo\0").expect("we provided bytes that has one NUL byte exactly at the end, so CStr::from_bytes_with_nul should not fail"));
     /// ```
     #[inline]
     #[must_use]
@@ -660,7 +660,7 @@ impl CString {
     /// use std::ffi::CString;
     /// assert_eq!(
     ///     CString::from_vec_with_nul(b"abc\0".to_vec())
-    ///         .expect("CString::from_vec_with_nul failed"),
+    ///         .expect("we provided bytes that has one NUL byte exactly at the end, so CString::from_vec_with_nul should not fail"),
     ///     c"abc".to_owned()
     /// );
     /// ```