diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2022-04-06 17:04:18 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2022-04-14 21:53:11 +0300 |
| commit | 7f3cc2fbbfbbc257a8763ae817a69452b9a7e31d (patch) | |
| tree | 4a07d582513528e76f45291d166f5da25f5f09dd /library/std/src | |
| parent | 5bee741a08a267f68ac6c3d24dadfe927bd45008 (diff) | |
| download | rust-7f3cc2fbbfbbc257a8763ae817a69452b9a7e31d.tar.gz rust-7f3cc2fbbfbbc257a8763ae817a69452b9a7e31d.zip | |
library: Use type aliases to make `CStr(ing)` in libcore/liballoc unstable
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/ffi/mod.rs | 18 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs index 5989ba71de0..0141a2bccdf 100644 --- a/library/std/src/ffi/mod.rs +++ b/library/std/src/ffi/mod.rs @@ -146,14 +146,24 @@ #![stable(feature = "rust1", since = "1.0.0")] +/// See [alloc::ffi::FromVecWithNulError]. #[stable(feature = "cstring_from_vec_with_nul", since = "1.58.0")] -pub use alloc::ffi::FromVecWithNulError; +pub type FromVecWithNulError = alloc::ffi::FromVecWithNulError; +/// See [alloc::ffi::CString]. #[stable(feature = "rust1", since = "1.0.0")] -pub use alloc::ffi::{CString, IntoStringError, NulError}; +pub type CString = alloc::ffi::CString; +/// See [alloc::ffi::IntoStringError]. #[stable(feature = "rust1", since = "1.0.0")] -pub use core::ffi::CStr; +pub type IntoStringError = alloc::ffi::IntoStringError; +/// See [alloc::ffi::NulError]. +#[stable(feature = "rust1", since = "1.0.0")] +pub type NulError = alloc::ffi::NulError; +/// See [core::ffi::CStr]. +#[stable(feature = "rust1", since = "1.0.0")] +pub type CStr = core::ffi::CStr; +/// See [core::ffi::FromBytesWithNulError]. #[stable(feature = "cstr_from_bytes", since = "1.10.0")] -pub use core::ffi::FromBytesWithNulError; +pub type FromBytesWithNulError = core::ffi::FromBytesWithNulError; #[stable(feature = "rust1", since = "1.0.0")] pub use self::os_str::{OsStr, OsString}; diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 411a38038f1..039e3d59a4d 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -260,6 +260,7 @@ #![feature(atomic_mut_ptr)] #![feature(char_error_internals)] #![feature(char_internals)] +#![feature(core_c_str)] #![feature(core_intrinsics)] #![feature(cstr_from_bytes_until_nul)] #![feature(cstr_internals)] @@ -288,6 +289,7 @@ // // Library features (alloc): #![feature(alloc_layout_extra)] +#![feature(alloc_c_string)] #![feature(allocator_api)] #![feature(get_mut_unchecked)] #![feature(map_try_insert)] |