diff options
| author | kennytm <kennytm@gmail.com> | 2019-03-16 14:56:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 14:56:19 +0800 |
| commit | 5e232b3b13b7a73b2ff38a18fd8bf88a307b9298 (patch) | |
| tree | b602993b09641671fc53d4664c563f5527b623fd | |
| parent | 382dfeab854d74f221e95d5870a203eb226d3c0f (diff) | |
| parent | 1243859d402427d90271d646968a6a4e5ad0052b (diff) | |
| download | rust-5e232b3b13b7a73b2ff38a18fd8bf88a307b9298.tar.gz rust-5e232b3b13b7a73b2ff38a18fd8bf88a307b9298.zip | |
Rollup merge of #58938 - dlrobertson:fix_58280, r=joshtriplett
core: ensure VaList passes improper_ctypes lint Ensure the `core::ffi::VaList` structure passes the `improper_ctypes` lint. Fixes: #58280
| -rw-r--r-- | src/libcore/ffi.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcore/ffi.rs b/src/libcore/ffi.rs index d88793f2801..5cc9c25c21e 100644 --- a/src/libcore/ffi.rs +++ b/src/libcore/ffi.rs @@ -79,9 +79,9 @@ impl fmt::Debug for VaListImpl { all supported platforms", issue = "44930")] struct VaListImpl { - stack: *mut (), - gr_top: *mut (), - vr_top: *mut (), + stack: *mut c_void, + gr_top: *mut c_void, + vr_top: *mut c_void, gr_offs: i32, vr_offs: i32, } @@ -98,8 +98,8 @@ struct VaListImpl { gpr: u8, fpr: u8, reserved: u16, - overflow_arg_area: *mut (), - reg_save_area: *mut (), + overflow_arg_area: *mut c_void, + reg_save_area: *mut c_void, } /// x86_64 ABI implementation of a `va_list`. @@ -113,8 +113,8 @@ struct VaListImpl { struct VaListImpl { gp_offset: i32, fp_offset: i32, - overflow_arg_area: *mut (), - reg_save_area: *mut (), + overflow_arg_area: *mut c_void, + reg_save_area: *mut c_void, } /// A wrapper for a `va_list` |