Skip to content

Commit

Permalink
abi/compatibility: also test Option-like types
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Oct 21, 2024
1 parent 3ec4308 commit b31b595
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion tests/ui/abi/compatibility.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,14 @@ impl Clone for Zst {
}
}

enum Either<T, U> {
Left(T),
Right(U),
}enum Either2<T, U> {
Left(T),
Right(U, ()),
}

#[repr(C)]
enum ReprCEnum<T> {
Variant1,
Expand Down Expand Up @@ -328,7 +336,8 @@ mod unsized_ {
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 {
($name:ident, $t:ty) => {
mod $name {
Expand All @@ -340,6 +349,12 @@ macro_rules! test_nonnull {
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_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);
}
}
}
Expand Down

0 comments on commit b31b595

Please sign in to comment.