From d650823839f7cb0084f50cb9e3ef09a98c4f26d9 Mon Sep 17 00:00:00 2001 From: Conor McAvity Date: Tue, 3 Dec 2019 17:08:10 -0800 Subject: [PATCH] Remove size_t to usize conversion rule --- src/codegen/mod.rs | 4 ++-- tests/expectations/tests/blocks-signature.rs | 12 +++++++++--- tests/expectations/tests/blocks.rs | 1 + tests/expectations/tests/issue-1498.rs | 3 ++- tests/expectations/tests/jsval_layout_opaque.rs | 3 ++- tests/expectations/tests/jsval_layout_opaque_1_0.rs | 3 ++- tests/expectations/tests/layout_array.rs | 3 ++- tests/expectations/tests/msvc-no-usr.rs | 3 ++- tests/expectations/tests/nsBaseHashtable.rs | 1 + 9 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index ac68c20bf0..f5e898ad5b 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -4092,9 +4092,9 @@ mod utils { "int64_t" => primitive_ty(ctx, "i64"), "uint64_t" => primitive_ty(ctx, "u64"), - "uintptr_t" | "size_t" => primitive_ty(ctx, "usize"), + "uintptr_t" => primitive_ty(ctx, "usize"), - "intptr_t" | "ptrdiff_t" | "ssize_t" => primitive_ty(ctx, "isize"), + "intptr_t" | "ptrdiff_t" => primitive_ty(ctx, "isize"), _ => return None, }) } diff --git a/tests/expectations/tests/blocks-signature.rs b/tests/expectations/tests/blocks-signature.rs index a45af3090c..691862b925 100644 --- a/tests/expectations/tests/blocks-signature.rs +++ b/tests/expectations/tests/blocks-signature.rs @@ -9,6 +9,7 @@ #![cfg(target_os = "macos")] extern crate block; +pub type size_t = ::std::os::raw::c_ulonglong; extern "C" { #[link_name = "\u{1}_Z8atexit_bU13block_pointerFvvE"] pub fn atexit_b(arg1: _bindgen_ty_id_33); @@ -82,11 +83,16 @@ impl Default for contains_block_pointers { } pub type _bindgen_ty_id_33 = *const ::block::Block<(), ()>; pub type _bindgen_ty_id_40 = *const ::block::Block< - (dispatch_data_t, usize, *const ::std::os::raw::c_void, usize), + ( + dispatch_data_t, + size_t, + *const ::std::os::raw::c_void, + size_t, + ), bool, >; -pub type _bindgen_ty_id_50 = *const ::block::Block<(usize,), ()>; -pub type _bindgen_ty_id_56 = *const ::block::Block<(usize,), ()>; +pub type _bindgen_ty_id_50 = *const ::block::Block<(size_t,), ()>; +pub type _bindgen_ty_id_56 = *const ::block::Block<(size_t,), ()>; pub type contains_block_pointers__bindgen_ty_id_61 = *const ::block::Block<(::std::os::raw::c_int,), ()>; pub type _bindgen_ty_id_68 = diff --git a/tests/expectations/tests/blocks.rs b/tests/expectations/tests/blocks.rs index 6a0dac194f..a8fa62c9ec 100644 --- a/tests/expectations/tests/blocks.rs +++ b/tests/expectations/tests/blocks.rs @@ -8,6 +8,7 @@ )] #![cfg(target_os = "macos")] +pub type size_t = ::std::os::raw::c_ulonglong; extern "C" { #[link_name = "\u{1}_Z8atexit_bU13block_pointerFvvE"] pub fn atexit_b(arg1: *mut ::std::os::raw::c_void); diff --git a/tests/expectations/tests/issue-1498.rs b/tests/expectations/tests/issue-1498.rs index 5dbf0bf5cd..2c8eb4fe41 100644 --- a/tests/expectations/tests/issue-1498.rs +++ b/tests/expectations/tests/issue-1498.rs @@ -7,6 +7,7 @@ non_upper_case_globals )] +pub type size_t = u64; #[repr(C, packed)] #[derive(Copy, Clone)] pub struct rte_memseg { @@ -14,7 +15,7 @@ pub struct rte_memseg { pub phys_addr: u64, pub __bindgen_anon_1: rte_memseg__bindgen_ty_1, ///< Length of the segment. - pub len: usize, + pub len: size_t, ///< The pagesize of underlying memory pub hugepage_sz: u64, ///< NUMA socket ID. diff --git a/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs index b07a8af4b9..0edcdc208b 100644 --- a/tests/expectations/tests/jsval_layout_opaque.rs +++ b/tests/expectations/tests/jsval_layout_opaque.rs @@ -97,6 +97,7 @@ where pub const JSVAL_TAG_SHIFT: u32 = 47; pub const JSVAL_PAYLOAD_MASK: u64 = 140737488355327; pub const JSVAL_TAG_MASK: i64 = -140737488355328; +pub type size_t = ::std::os::raw::c_ulonglong; #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum JSValueType { @@ -188,7 +189,7 @@ pub union jsval_layout { pub s: jsval_layout__bindgen_ty_2, pub asDouble: f64, pub asPtr: *mut ::std::os::raw::c_void, - pub asWord: usize, + pub asWord: size_t, pub asUIntPtr: usize, _bindgen_union_align: u64, } diff --git a/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/tests/expectations/tests/jsval_layout_opaque_1_0.rs index 30b39d2031..46f5b1c912 100644 --- a/tests/expectations/tests/jsval_layout_opaque_1_0.rs +++ b/tests/expectations/tests/jsval_layout_opaque_1_0.rs @@ -140,6 +140,7 @@ impl ::std::cmp::Eq for __BindgenUnionField {} pub const JSVAL_TAG_SHIFT: u32 = 47; pub const JSVAL_PAYLOAD_MASK: u64 = 140737488355327; pub const JSVAL_TAG_MASK: i64 = -140737488355328; +pub type size_t = ::std::os::raw::c_ulonglong; #[repr(u8)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum JSValueType { @@ -231,7 +232,7 @@ pub struct jsval_layout { pub s: __BindgenUnionField, pub asDouble: __BindgenUnionField, pub asPtr: __BindgenUnionField<*mut ::std::os::raw::c_void>, - pub asWord: __BindgenUnionField, + pub asWord: __BindgenUnionField, pub asUIntPtr: __BindgenUnionField, pub bindgen_union_field: u64, } diff --git a/tests/expectations/tests/layout_array.rs b/tests/expectations/tests/layout_array.rs index 8ddbbb1f68..597f03d5ef 100644 --- a/tests/expectations/tests/layout_array.rs +++ b/tests/expectations/tests/layout_array.rs @@ -11,6 +11,7 @@ pub const RTE_CACHE_LINE_SIZE: u32 = 64; pub const RTE_MEMPOOL_OPS_NAMESIZE: u32 = 32; pub const RTE_MEMPOOL_MAX_OPS_IDX: u32 = 16; pub const RTE_HEAP_NUM_FREELISTS: u32 = 13; +pub type size_t = ::std::os::raw::c_longlong; #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct rte_mempool { @@ -292,7 +293,7 @@ pub struct malloc_heap { pub lock: rte_spinlock_t, pub free_head: [malloc_heap__bindgen_ty_1; 13usize], pub alloc_count: ::std::os::raw::c_uint, - pub total_size: usize, + pub total_size: size_t, } #[repr(C)] #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] diff --git a/tests/expectations/tests/msvc-no-usr.rs b/tests/expectations/tests/msvc-no-usr.rs index e7cab0a0b7..ad0f52c69f 100644 --- a/tests/expectations/tests/msvc-no-usr.rs +++ b/tests/expectations/tests/msvc-no-usr.rs @@ -7,10 +7,11 @@ non_upper_case_globals )] +pub type size_t = ::std::os::raw::c_ulonglong; #[repr(C)] #[derive(Debug, Default, Copy, Clone)] pub struct A { - pub foo: usize, + pub foo: size_t, } #[test] fn bindgen_test_layout_A() { diff --git a/tests/expectations/tests/nsBaseHashtable.rs b/tests/expectations/tests/nsBaseHashtable.rs index 8006c92e17..e229305d80 100644 --- a/tests/expectations/tests/nsBaseHashtable.rs +++ b/tests/expectations/tests/nsBaseHashtable.rs @@ -7,6 +7,7 @@ non_upper_case_globals )] +pub type size_t = ::std::os::raw::c_ulonglong; #[repr(C)] #[derive(Debug, Default, Copy, Clone)] pub struct nsBaseHashtableET {