diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2022-06-20 13:59:58 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2022-07-13 19:28:20 -0700 |
| commit | d431338b2521dee00b0758e1609e8af7320515d4 (patch) | |
| tree | 4ecf2c9ac6d14d5de0b0d740ce5c805be2232458 | |
| parent | b12708f7f40463b2131f0c47d1e8a4ffb543a422 (diff) | |
| download | rust-d431338b2521dee00b0758e1609e8af7320515d4.tar.gz rust-d431338b2521dee00b0758e1609e8af7320515d4.zip | |
Stabilize `core::ffi:c_*` and rexport in `std::ffi`
This only stabilizes the base types, not the non-zero variants, since those have their own separate tracking issue and have not gone through FCP to stabilize.
| -rw-r--r-- | library/alloc/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/alloc/tests/lib.rs | 1 | ||||
| -rw-r--r-- | library/core/src/ffi/mod.rs | 2 | ||||
| -rw-r--r-- | library/core/tests/lib.rs | 1 | ||||
| -rw-r--r-- | library/std/src/ffi/mod.rs | 6 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index c08caa7b93e..26e4a4acb1c 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -108,7 +108,6 @@ #![feature(const_refs_to_cell)] #![feature(core_c_str)] #![feature(core_intrinsics)] -#![feature(core_ffi_c)] #![feature(const_eval_select)] #![feature(const_pin)] #![feature(cstr_from_bytes_until_nul)] diff --git a/library/alloc/tests/lib.rs b/library/alloc/tests/lib.rs index 367cdcdcc06..bf5d0c941e9 100644 --- a/library/alloc/tests/lib.rs +++ b/library/alloc/tests/lib.rs @@ -12,7 +12,6 @@ #![feature(const_ptr_write)] #![feature(const_try)] #![feature(core_c_str)] -#![feature(core_ffi_c)] #![feature(core_intrinsics)] #![feature(drain_filter)] #![feature(exact_size_is_empty)] diff --git a/library/core/src/ffi/mod.rs b/library/core/src/ffi/mod.rs index 93cdf121fbe..b61f3b6a530 100644 --- a/library/core/src/ffi/mod.rs +++ b/library/core/src/ffi/mod.rs @@ -26,7 +26,7 @@ macro_rules! type_alias_no_nz { } => { #[doc = include_str!($Docfile)] $( $Cfg )* - #[unstable(feature = "core_ffi_c", issue = "94501")] + #[stable(feature = "core_ffi_c", since = "1.64.0")] pub type $Alias = $Real; } } diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs index 63c9602abe7..8d91bb4d4d0 100644 --- a/library/core/tests/lib.rs +++ b/library/core/tests/lib.rs @@ -19,7 +19,6 @@ #![feature(const_ptr_write)] #![feature(const_trait_impl)] #![feature(const_likely)] -#![feature(core_ffi_c)] #![feature(core_intrinsics)] #![feature(core_private_bignum)] #![feature(core_private_diy_float)] diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs index 94ae97a2e40..484f42dafc3 100644 --- a/library/std/src/ffi/mod.rs +++ b/library/std/src/ffi/mod.rs @@ -168,6 +168,12 @@ pub type FromBytesWithNulError = core::ffi::FromBytesWithNulError; #[stable(feature = "rust1", since = "1.0.0")] pub use self::os_str::{OsStr, OsString}; +#[stable(feature = "core_ffi_c", since = "1.64.0")] +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, +}; + #[stable(feature = "core_c_void", since = "1.30.0")] pub use core::ffi::c_void; diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 7da9f248c87..9862034171a 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -315,7 +315,6 @@ #![feature(cfg_eval)] #![feature(concat_bytes)] #![feature(const_format_args)] -#![feature(core_ffi_c)] #![feature(core_panic)] #![feature(custom_test_frameworks)] #![feature(edition_panic)] |