Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

abi/compatibility: also test Option-like types #132002

Merged
merged 1 commit into from
Oct 23, 2024
Merged

abi/compatibility: also test Option-like types #132002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion tests/ui/abi/compatibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
enum ReprCEnum<T> {
Variant1,
Expand Down Expand Up @@ -328,7 +337,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 +350,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
Loading