Unrolled build for #155754

rust-timer · web-flow · commit 50bf78e3a63a · 2026-04-25T05:28:51.000+02:00
Rollup merge of #155754 - folkertdev:hide-core-ffi-va-list, r=tgross35 make the `core::ffi::va_list` module private tracking issue: #44930 the types are exported from `core::ffi` itself. T-libs-api decided that we should only export the types from `core::ffi`, and should not make `core::ffi::va_list` public, see #44930 (comment). r? tgross35
diff --git a/library/core/src/ffi/mod.rs b/library/core/src/ffi/mod.rs
@@ -23,20 +23,14 @@ use crate::fmt;
 #[stable(feature = "c_str_module", since = "1.88.0")]
 pub mod c_str;
 
+mod va_list;
 #[unstable(
     feature = "c_variadic",
     issue = "44930",
     reason = "the `c_variadic` feature has not been properly tested on all supported platforms"
 )]
 pub use self::va_list::{VaArgSafe, VaList};
 
-#[unstable(
-    feature = "c_variadic",
-    issue = "44930",
-    reason = "the `c_variadic` feature has not been properly tested on all supported platforms"
-)]
-pub mod va_list;
-
 mod primitives;
 #[stable(feature = "core_ffi_c", since = "1.64.0")]
 pub use self::primitives::{
diff --git a/library/core/src/ffi/va_list.rs b/library/core/src/ffi/va_list.rs
@@ -2,6 +2,12 @@
 //!
 //! Better known as "varargs".
 
+#![unstable(
+    feature = "c_variadic",
+    issue = "44930",
+    reason = "the `c_variadic` feature has not been properly tested on all supported platforms"
+)]
+
 #[cfg(not(target_arch = "xtensa"))]
 use crate::ffi::c_void;
 use crate::fmt;
diff --git a/library/core/src/intrinsics/mod.rs b/library/core/src/intrinsics/mod.rs
@@ -53,7 +53,7 @@
     issue = "none"
 )]
 
-use crate::ffi::va_list::{VaArgSafe, VaList};
+use crate::ffi::{VaArgSafe, VaList};
 use crate::marker::{ConstParamTy, DiscriminantKind, PointeeSized, Tuple};
 use crate::{mem, ptr};
 
