Skip to content

Commit efd68db

Browse files
authored
Rollup merge of rust-lang#113701 - aswild:std-ffi-frombytesuntilnul, r=dtolnay
Re-export core::ffi::FromBytesUntilNulError in std::ffi Like the other CStr and CString error types, make a re-export for std::ffi::FromBytesUntilNulError. This seems to have slipped through the cracks in the cstr_from_bytes_until_nul implementation and core_c_str migration. Tracking Issue: rust-lang#95027
2 parents bcfa49f + fda3d2a commit efd68db

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

library/std/src/ffi/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@
156156

157157
#[stable(feature = "alloc_c_string", since = "1.64.0")]
158158
pub use alloc::ffi::{CString, FromVecWithNulError, IntoStringError, NulError};
159+
#[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")]
160+
pub use core::ffi::FromBytesUntilNulError;
159161
#[stable(feature = "core_c_str", since = "1.64.0")]
160162
pub use core::ffi::{CStr, FromBytesWithNulError};
161163

0 commit comments

Comments
 (0)