diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-07-14 14:14:20 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 14:14:20 +0530 |
| commit | 103b8602b7e3cfc8301ab9e0981563bde3789ea7 (patch) | |
| tree | 700a5edfc59f759cd561d02b4d6c0953facec934 | |
| parent | f5e9cb53ab35bdf6e1bdd75894eca93ac7d8a0be (diff) | |
| parent | d431338b2521dee00b0758e1609e8af7320515d4 (diff) | |
| download | rust-103b8602b7e3cfc8301ab9e0981563bde3789ea7.tar.gz rust-103b8602b7e3cfc8301ab9e0981563bde3789ea7.zip | |
Rollup merge of #98315 - joshtriplett:stabilize-core-ffi-c, r=Mark-Simulacrum
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 d3816d70b63..d68e0a9d66f 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 43e4b7f08e2..3b711c6b72d 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 2c54bfb35eb..5849a37444f 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 298321f41e4..244597950fa 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -317,7 +317,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)] |