Rollup merge of #94534 - bstrie:cffistd, r=Mark-Simulacrum

Re-export (unstable) core::ffi types from std::ffi
rust-lang · Mar 3, 2022 · 6f1730c · 6f1730c
2 parents 845516c + 9aed829
commit 6f1730c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs
@@ -159,6 +159,15 @@ pub use self::os_str::{OsStr, OsString};
 #[stable(feature = "core_c_void", since = "1.30.0")]
 pub use core::ffi::c_void;
 
+#[unstable(feature = "core_ffi_c", issue = "94501")]
+pub use core::ffi::{
+    c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint,
+    c_ulong, c_ulonglong, c_ushort,
+};
+
+#[unstable(feature = "c_size_t", issue = "88345")]
+pub use core::ffi::{c_ptrdiff_t, c_size_t, c_ssize_t};
+
 #[unstable(
     feature = "c_variadic",
     reason = "the `c_variadic` feature has not been properly tested on \

diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
@@ -261,6 +261,7 @@
 #![feature(const_socketaddr)]
 #![feature(const_trait_impl)]
 #![feature(container_error_extra)]
+#![feature(c_size_t)]
 #![feature(core_ffi_c)]
 #![feature(core_intrinsics)]
 #![feature(core_panic)]