Skip to content

Commit

Permalink
Rollup merge of rust-lang#58938 - dlrobertson:fix_58280, r=joshtriplett
Browse files Browse the repository at this point in the history
core: ensure VaList passes improper_ctypes lint

Ensure the `core::ffi::VaList` structure passes the `improper_ctypes` lint.

Fixes: rust-lang#58280
  • Loading branch information
Centril authored Mar 10, 2019
2 parents cae31da + 1243859 commit e840d55
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/libcore/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand All @@ -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`.
Expand All @@ -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`
Expand Down

0 comments on commit e840d55

Please sign in to comment.