bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #132002 - RalfJung:abi-compat-option-like, r=compiler-errors

Browse source 
abi/compatibility: also test Option-like types

Adds tests for the decision [here](https://github.com/rust-lang/rust/pull/130628#issuecomment-2402761599).

Cc ``@workingjubilee``
This commit is contained in:
Matthias Krüger 2024-10-23 06:51:24 +02:00 • committed by GitHub
commit 7e1dbaec13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/ui/abi/compatibility.rs
View file

@ -211,6 +211,15 @@ impl Clone for Zst {
} }
} }
enum Either<T, U> {
Left(T),
Right(U),
}
enum Either2<T, U> {
Left(T),
Right(U, ()),
}
#[repr(C)] #[repr(C)]
enum ReprCEnum<T> { enum ReprCEnum<T> {
Variant1, Variant1,
@ -328,7 +337,8 @@ mod unsized_ {
test_transparent_unsized!(dyn_trait, dyn Any); test_transparent_unsized!(dyn_trait, dyn Any);
} }
// RFC 3391 <https://rust-lang.github.io/rfcs/3391-result_ffi_guarantees.html>. // RFC 3391 <https://rust-lang.github.io/rfcs/3391-result_ffi_guarantees.html>, including the
// extension ratified at <https://github.com/rust-lang/rust/pull/130628#issuecomment-2402761599>.
macro_rules! test_nonnull { macro_rules! test_nonnull {
($name:ident, $t:ty) => { ($name:ident, $t:ty) => {
mod $name { mod $name {
@ -340,6 +350,12 @@ macro_rules! test_nonnull {
test_abi_compatible!(result_ok_zst, Result<Zst, $t>, $t); test_abi_compatible!(result_ok_zst, Result<Zst, $t>, $t);
test_abi_compatible!(result_err_arr, Result<$t, [i8; 0]>, $t); test_abi_compatible!(result_err_arr, Result<$t, [i8; 0]>, $t);
test_abi_compatible!(result_ok_arr, Result<[i8; 0], $t>, $t); test_abi_compatible!(result_ok_arr, Result<[i8; 0], $t>, $t);
test_abi_compatible!(result_err_void, Result<$t, Void>, $t);
test_abi_compatible!(result_ok_void, Result<Void, $t>, $t);
test_abi_compatible!(either_err_zst, Either<$t, Zst>, $t);
test_abi_compatible!(either_ok_zst, Either<Zst, $t>, $t);
test_abi_compatible!(either2_err_zst, Either2<$t, Zst>, $t);
test_abi_compatible!(either2_err_arr, Either2<$t, [i8; 0]>, $t);
} }
} }
} }