From 07ea143f96929ac7f0b7af0f025be48a472273e5 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Wed, 27 Apr 2022 13:47:10 -0700
Subject: [PATCH] Revert "Re-export core::ffi types from std::ffi"
This reverts commit 9aed829fe6cdf5eaf278c6c3972f7acd0830887d.
Fixes https://github.com/rust-lang/rust/issues/96435 , a regression
in crates doing `use std::ffi::*;` and `use std::os::raw::*;`.
We can re-add this re-export once the `core::ffi` types
are stable, and thus the `std::os::raw` types can become re-exports as
well, which will avoid the conflict. (Type aliases to the same type
still conflict, but re-exports of the same type don't.)
---
library/std/src/ffi/mod.rs | 9 ---------
library/std/src/lib.rs | 1 -
2 files changed, 10 deletions(-)
diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs
index 0141a2bccdf16..10983a3323265 100644
--- a/library/std/src/ffi/mod.rs
+++ b/library/std/src/ffi/mod.rs
@@ -171,15 +171,6 @@ 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 f60b604f1b167..97c30c422827e 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -307,7 +307,6 @@
// Only for re-exporting:
#![feature(assert_matches)]
#![feature(async_iterator)]
-#![feature(c_size_t)]
#![feature(c_variadic)]
#![feature(cfg_accessible)]
#![feature(cfg_eval)]