diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-03-03 11:02:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-03 11:02:53 +0100 |
| commit | 6f1730c9e3eac736217cb96b8ea8c1ca2d01c8c3 (patch) | |
| tree | 6415b984c0f851c595048c2031b1b4f2c7e96ca0 | |
| parent | 845516cd3b7b8609bc0f7e664269e7f3eb9b3952 (diff) | |
| parent | 9aed829fe6cdf5eaf278c6c3972f7acd0830887d (diff) | |
| download | rust-6f1730c9e3eac736217cb96b8ea8c1ca2d01c8c3.tar.gz rust-6f1730c9e3eac736217cb96b8ea8c1ca2d01c8c3.zip | |
Rollup merge of #94534 - bstrie:cffistd, r=Mark-Simulacrum
Re-export (unstable) core::ffi types from std::ffi
| -rw-r--r-- | library/std/src/ffi/mod.rs | 9 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs index 019b64c395e..13e3dacc30d 100644 --- 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 index 4603b5aae20..10fec8e1152 100644 --- 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)] |