Skip to content

Commit 7baf066

Browse files
lang: Strengthen RFC 3391 guarantees to match T-lang consensus
1 parent 1f81242 commit 7baf066

File tree

1 file changed

+71
-0
lines changed

1 file changed

+71
-0
lines changed

Diff for: tests/ui/rfcs/rfc-3391-result-ffi-guarantees.rs

+71
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,27 @@
11
//@ build-pass
2+
/*!
3+
4+
The guarantees in RFC 3391 were strengthened as a result of the 2024 Oct 09 T-lang meeting[^1]
5+
following the precedent of T-lang's guaranteeing[^2] ABI compatibility for "Option-like" enums[^2].
6+
We now guarantee ABI compatibility for enums that conform to these rules described by scottmcm:
7+
8+
* The enum `E` has exactly two variants.
9+
* One variant has exactly one field, of type `T`.
10+
* `T` is a `rustc_nonnull_optimization_guaranteed` type.
11+
* All fields of the other variant are 1-ZSTs.
12+
13+
Where "all" fields includes "there aren't any fields, so they're vacuously all 1-ZSTs".
14+
15+
Note: "1-ZST" means a type of size 0 and alignment 1.
16+
17+
The reason alignment of the zero-sized type matters is it can affect the alignment of the enum,
18+
which also will affect its size if the enum has a non-zero size.
19+
20+
[^1]: <https://github.com/rust-lang/rust/pull/130628#issuecomment-2402761599>
21+
[^2]: <https://github.com/rust-lang/rust/pull/60300#issuecomment-487000474>
22+
23+
*/
24+
225
#![allow(dead_code)]
326
#![deny(improper_ctypes)]
427
#![feature(ptr_internals)]
@@ -59,4 +82,52 @@ extern "C" {
5982
fn result_1zst_exhaustive_no_field_e(x: Result<NoField, num::NonZero<u8>>);
6083
}
6184

85+
// Custom "Result-like" enum for testing custom "Option-like" types are also accepted
86+
enum Either<L, R> {
87+
Left(L),
88+
Right(R),
89+
}
90+
91+
extern "C" {
92+
fn either_ref_t(x: Either<&'static u8, ()>);
93+
fn either_fn_t(x: Either<extern "C" fn(), ()>);
94+
fn either_nonnull_t(x: Either<std::ptr::NonNull<u8>, ()>);
95+
fn either_unique_t(x: Either<std::ptr::Unique<u8>, ()>);
96+
fn either_nonzero_u8_t(x: Either<num::NonZero<u8>, ()>);
97+
fn either_nonzero_u16_t(x: Either<num::NonZero<u16>, ()>);
98+
fn either_nonzero_u32_t(x: Either<num::NonZero<u32>, ()>);
99+
fn either_nonzero_u64_t(x: Either<num::NonZero<u64>, ()>);
100+
fn either_nonzero_usize_t(x: Either<num::NonZero<usize>, ()>);
101+
fn either_nonzero_i8_t(x: Either<num::NonZero<i8>, ()>);
102+
fn either_nonzero_i16_t(x: Either<num::NonZero<i16>, ()>);
103+
fn either_nonzero_i32_t(x: Either<num::NonZero<i32>, ()>);
104+
fn either_nonzero_i64_t(x: Either<num::NonZero<i64>, ()>);
105+
fn either_nonzero_isize_t(x: Either<num::NonZero<isize>, ()>);
106+
fn either_transparent_struct_t(x: Either<TransparentStruct<num::NonZero<u8>>, ()>);
107+
fn either_transparent_enum_t(x: Either<TransparentEnum<num::NonZero<u8>>, ()>);
108+
fn either_phantom_t(x: Either<num::NonZero<u8>, std::marker::PhantomData<()>>);
109+
fn either_1zst_exhaustive_no_variant_t(x: Either<num::NonZero<u8>, Z>);
110+
fn either_1zst_exhaustive_no_field_t(x: Either<num::NonZero<u8>, NoField>);
111+
112+
fn either_ref_e(x: Either<(), &'static u8>);
113+
fn either_fn_e(x: Either<(), extern "C" fn()>);
114+
fn either_nonnull_e(x: Either<(), std::ptr::NonNull<u8>>);
115+
fn either_unique_e(x: Either<(), std::ptr::Unique<u8>>);
116+
fn either_nonzero_u8_e(x: Either<(), num::NonZero<u8>>);
117+
fn either_nonzero_u16_e(x: Either<(), num::NonZero<u16>>);
118+
fn either_nonzero_u32_e(x: Either<(), num::NonZero<u32>>);
119+
fn either_nonzero_u64_e(x: Either<(), num::NonZero<u64>>);
120+
fn either_nonzero_usize_e(x: Either<(), num::NonZero<usize>>);
121+
fn either_nonzero_i8_e(x: Either<(), num::NonZero<i8>>);
122+
fn either_nonzero_i16_e(x: Either<(), num::NonZero<i16>>);
123+
fn either_nonzero_i32_e(x: Either<(), num::NonZero<i32>>);
124+
fn either_nonzero_i64_e(x: Either<(), num::NonZero<i64>>);
125+
fn either_nonzero_isize_e(x: Either<(), num::NonZero<isize>>);
126+
fn either_transparent_struct_e(x: Either<(), TransparentStruct<num::NonZero<u8>>>);
127+
fn either_transparent_enum_e(x: Either<(), TransparentEnum<num::NonZero<u8>>>);
128+
fn either_phantom_e(x: Either<num::NonZero<u8>, std::marker::PhantomData<()>>);
129+
fn either_1zst_exhaustive_no_variant_e(x: Either<Z, num::NonZero<u8>>);
130+
fn either_1zst_exhaustive_no_field_e(x: Either<NoField, num::NonZero<u8>>);
131+
}
132+
62133
pub fn main() {}

0 commit comments

Comments
 (0)