mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #132303 - nyurik:non-exhaustive-err, r=compiler-errors

Browse Source 
More tests for non-exhaustive C-like enums in FFI

Add a few more tests for the `improper_ctypes` lint as found with the [varnish-rs](https://github.com/gquintard/varnish-rs) project.

This follows up on #116831, fixed in #116863 by ``@workingjubilee`` - I have been seeing these fail with the bindgen-generated non-exhaustive enums inside other structs. Seems the issue does not exist in the primary branch, so this PR just makes sure more cases are covered for the future.
This commit is contained in:
Jubilee 2024-11-04 20:40:45 -08:00 committed by GitHub
commit 56aa51e67f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/auxiliary/types.rs
View File

@ -38,3 +38,9 @@ pub enum NonExhaustiveCLikeEnum {
Four = 4, Four = 4,
Five = 5, Five = 5,
} }
#[repr(C)]
pub struct NormalStructWithNonExhaustiveCLikeEnum {
one: u8,
two: NonExhaustiveCLikeEnum,
}

5
tests/ui/rfcs/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.rs
View File

@ -8,7 +8,7 @@
use types::{ use types::{
NonExhaustiveCLikeEnum, NonExhaustiveEnum, NonExhaustiveVariants, NonExhaustiveCLikeEnum, NonExhaustiveEnum, NonExhaustiveVariants,
NormalStruct, TupleStruct, UnitStruct, NormalStruct, TupleStruct, UnitStruct, NormalStructWithNonExhaustiveCLikeEnum
}; };
extern "C" { extern "C" {
@ -27,6 +27,9 @@
// These should pass without remark, as they're C-compatible, despite being "non-exhaustive". // These should pass without remark, as they're C-compatible, despite being "non-exhaustive".
extern "C" { extern "C" {
pub fn non_exhaustive_c_compat_enum(_: NonExhaustiveCLikeEnum); pub fn non_exhaustive_c_compat_enum(_: NonExhaustiveCLikeEnum);
pub fn non_exhaustive_c_compat_enum_ret() -> *mut NonExhaustiveCLikeEnum;
pub fn struct_w_non_exhaustive_c_like_enum(_: NormalStructWithNonExhaustiveCLikeEnum);
pub fn struct_w_non_exhaustive_c_like_enum_ret() -> *mut NormalStructWithNonExhaustiveCLikeEnum;
} }
fn main() {} fn main() {}