Skip to content

Commit 6f1730c

Browse files
authored
Rollup merge of #94534 - bstrie:cffistd, r=Mark-Simulacrum
Re-export (unstable) core::ffi types from std::ffi
2 parents 845516c + 9aed829 commit 6f1730c

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

library/std/src/ffi/mod.rs

+9
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,15 @@ pub use self::os_str::{OsStr, OsString};
159159
#[stable(feature = "core_c_void", since = "1.30.0")]
160160
pub use core::ffi::c_void;
161161

162+
#[unstable(feature = "core_ffi_c", issue = "94501")]
163+
pub use core::ffi::{
164+
c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint,
165+
c_ulong, c_ulonglong, c_ushort,
166+
};
167+
168+
#[unstable(feature = "c_size_t", issue = "88345")]
169+
pub use core::ffi::{c_ptrdiff_t, c_size_t, c_ssize_t};
170+
162171
#[unstable(
163172
feature = "c_variadic",
164173
reason = "the `c_variadic` feature has not been properly tested on \

library/std/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@
261261
#![feature(const_socketaddr)]
262262
#![feature(const_trait_impl)]
263263
#![feature(container_error_extra)]
264+
#![feature(c_size_t)]
264265
#![feature(core_ffi_c)]
265266
#![feature(core_intrinsics)]
266267
#![feature(core_panic)]

0 commit comments

Comments
 (0)