about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Howell <michael@notriddle.com>2024-12-26 08:58:17 -0700
committerJosh Stone <jistone@redhat.com>2025-01-02 14:28:32 -0800
commit6cc24819e50794c81974635145e9d924cc27cada (patch)
tree16f3288540c87e4525d6beb9d043725206357b25
parent730b84074daddf85905b70f6df9ce438b02cdedc (diff)
downloadrust-6cc24819e50794c81974635145e9d924cc27cada.tar.gz
rust-6cc24819e50794c81974635145e9d924cc27cada.zip
docs: inline `std::ffi::c_str` types to `std::ffi`
Rustdoc has no way to show that an item is stable,
but only at a different path. `std::ffi::c_str::NulError` is
not stable, but `std::ffi::NulError` is.

To avoid marking these types as unstable when someone just
wants to follow a link from `CString`, inline them into their
stable paths.

(cherry picked from commit 40b0026a2f1c50e88909f49e8ef8c7ae074f5a9b)
-rw-r--r--library/std/src/ffi/mod.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs
index 469136be883..7d7cce09a3f 100644
--- a/library/std/src/ffi/mod.rs
+++ b/library/std/src/ffi/mod.rs
@@ -179,19 +179,19 @@ pub use core::ffi::{
     c_ulong, c_ulonglong, c_ushort,
 };
 
-#[doc(no_inline)]
+#[doc(inline)]
 #[stable(feature = "cstr_from_bytes_until_nul", since = "1.69.0")]
 pub use self::c_str::FromBytesUntilNulError;
-#[doc(no_inline)]
+#[doc(inline)]
 #[stable(feature = "cstr_from_bytes", since = "1.10.0")]
 pub use self::c_str::FromBytesWithNulError;
-#[doc(no_inline)]
+#[doc(inline)]
 #[stable(feature = "cstring_from_vec_with_nul", since = "1.58.0")]
 pub use self::c_str::FromVecWithNulError;
-#[doc(no_inline)]
+#[doc(inline)]
 #[stable(feature = "cstring_into", since = "1.7.0")]
 pub use self::c_str::IntoStringError;
-#[doc(no_inline)]
+#[doc(inline)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::c_str::NulError;
 #[doc(inline)]