Skip to content

Commit be44888

Browse files
authored
Rollup merge of rust-lang#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.
2 parents 8551c3c + d431338 commit be44888

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

library/alloc/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
#![feature(const_refs_to_cell)]
109109
#![feature(core_c_str)]
110110
#![feature(core_intrinsics)]
111-
#![feature(core_ffi_c)]
112111
#![feature(const_eval_select)]
113112
#![feature(const_pin)]
114113
#![feature(cstr_from_bytes_until_nul)]

library/alloc/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#![feature(const_ptr_write)]
1313
#![feature(const_try)]
1414
#![feature(core_c_str)]
15-
#![feature(core_ffi_c)]
1615
#![feature(core_intrinsics)]
1716
#![feature(drain_filter)]
1817
#![feature(exact_size_is_empty)]

library/core/src/ffi/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ macro_rules! type_alias_no_nz {
2626
} => {
2727
#[doc = include_str!($Docfile)]
2828
$( $Cfg )*
29-
#[unstable(feature = "core_ffi_c", issue = "94501")]
29+
#[stable(feature = "core_ffi_c", since = "1.64.0")]
3030
pub type $Alias = $Real;
3131
}
3232
}

library/core/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#![feature(const_ptr_write)]
2020
#![feature(const_trait_impl)]
2121
#![feature(const_likely)]
22-
#![feature(core_ffi_c)]
2322
#![feature(core_intrinsics)]
2423
#![feature(core_private_bignum)]
2524
#![feature(core_private_diy_float)]

library/std/src/ffi/mod.rs

+6
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,12 @@ pub type FromBytesWithNulError = core::ffi::FromBytesWithNulError;
168168
#[stable(feature = "rust1", since = "1.0.0")]
169169
pub use self::os_str::{OsStr, OsString};
170170

171+
#[stable(feature = "core_ffi_c", since = "1.64.0")]
172+
pub use core::ffi::{
173+
c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint,
174+
c_ulong, c_ulonglong, c_ushort,
175+
};
176+
171177
#[stable(feature = "core_c_void", since = "1.30.0")]
172178
pub use core::ffi::c_void;
173179

library/std/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@
317317
#![feature(cfg_eval)]
318318
#![feature(concat_bytes)]
319319
#![feature(const_format_args)]
320-
#![feature(core_ffi_c)]
321320
#![feature(core_panic)]
322321
#![feature(custom_test_frameworks)]
323322
#![feature(edition_panic)]

0 commit comments

Comments
 (0)