diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-07-31 22:51:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 22:51:13 +0200 |
| commit | efd68db768530df18e2de1ffa6cc01911c514565 (patch) | |
| tree | 162e95f2332e80916c6ce7999f42ba0a85807edf | |
| parent | bcfa49f162de64209cc9ed64cfcd36942e67b02a (diff) | |
| parent | fda3d2abaa325c49a6ff382a624af59c6e75db37 (diff) | |
| download | rust-efd68db768530df18e2de1ffa6cc01911c514565.tar.gz rust-efd68db768530df18e2de1ffa6cc01911c514565.zip | |
Rollup merge of #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: #95027
| -rw-r--r-- | library/std/src/ffi/mod.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs index 3ddb8748753..b0484474712 100644 --- a/library/std/src/ffi/mod.rs +++ b/library/std/src/ffi/mod.rs @@ -156,6 +156,8 @@ #[stable(feature = "alloc_c_string", since = "1.64.0")] pub use alloc::ffi::{CString, FromVecWithNulError, IntoStringError, NulError}; +#[stable(feature = "cstr_from_bytes_until_nul", since = "CURRENT_RUSTC_VERSION")] +pub use core::ffi::FromBytesUntilNulError; #[stable(feature = "core_c_str", since = "1.64.0")] pub use core::ffi::{CStr, FromBytesWithNulError}; |