Use c_schar instead of c_char

pyropeter · pyropeter · commit 4f1e3da85021 · 2017-03-05T14:35:51.000+01:00
The signedness of the C type 'char' is implementation defined. The
rust type c_schar exists for this reason. Use it.
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
@@ -2138,7 +2138,7 @@ impl ToRustTy for Type {
             TypeKind::Int(ik) => {
                 match ik {
                     IntKind::Bool => aster::ty::TyBuilder::new().bool(),
-                    IntKind::Char => raw_type(ctx, "c_char"),
+                    IntKind::Char => raw_type(ctx, "c_schar"),
                     IntKind::UChar => raw_type(ctx, "c_uchar"),
                     IntKind::Short => raw_type(ctx, "c_short"),
                     IntKind::UShort => raw_type(ctx, "c_ushort"),
diff --git a/tests/expectations/tests/arg_keyword.rs b/tests/expectations/tests/arg_keyword.rs
@@ -6,5 +6,5 @@
 
 extern "C" {
     #[link_name = "_Z3fooPKc"]
-    pub fn foo(type_: *const ::std::os::raw::c_char);
+    pub fn foo(type_: *const ::std::os::raw::c_schar);
 }
diff --git a/tests/expectations/tests/bitfield-enum-basic.rs b/tests/expectations/tests/bitfield-enum-basic.rs
@@ -33,7 +33,7 @@ impl ::std::ops::BitOr<Buz> for Buz {
 }
 #[repr(C)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct Buz(pub ::std::os::raw::c_char);
+pub struct Buz(pub ::std::os::raw::c_schar);
 pub const NS_FOO: _bindgen_ty_1 = _bindgen_ty_1(1);
 pub const NS_BAR: _bindgen_ty_1 = _bindgen_ty_1(2);
 impl ::std::ops::BitOr<_bindgen_ty_1> for _bindgen_ty_1 {
diff --git a/tests/expectations/tests/class.rs b/tests/expectations/tests/class.rs
@@ -64,7 +64,7 @@ impl <T> ::std::fmt::Debug for __BindgenUnionField<T> {
 #[repr(C)]
 pub struct C {
     pub a: ::std::os::raw::c_int,
-    pub big_array: [::std::os::raw::c_char; 33usize],
+    pub big_array: [::std::os::raw::c_schar; 33usize],
 }
 #[test]
 fn bindgen_test_layout_C() {
@@ -88,8 +88,8 @@ impl Default for C {
 #[repr(C)]
 pub struct C_with_zero_length_array {
     pub a: ::std::os::raw::c_int,
-    pub big_array: [::std::os::raw::c_char; 33usize],
-    pub zero_length_array: __IncompleteArrayField<::std::os::raw::c_char>,
+    pub big_array: [::std::os::raw::c_schar; 33usize],
+    pub zero_length_array: __IncompleteArrayField<::std::os::raw::c_schar>,
 }
 #[test]
 fn bindgen_test_layout_C_with_zero_length_array() {
@@ -124,8 +124,8 @@ impl Default for C_with_zero_length_array {
 #[repr(C)]
 pub struct C_with_incomplete_array {
     pub a: ::std::os::raw::c_int,
-    pub big_array: [::std::os::raw::c_char; 33usize],
-    pub incomplete_array: __IncompleteArrayField<::std::os::raw::c_char>,
+    pub big_array: [::std::os::raw::c_schar; 33usize],
+    pub incomplete_array: __IncompleteArrayField<::std::os::raw::c_schar>,
 }
 #[test]
 fn bindgen_test_layout_C_with_incomplete_array() {
@@ -142,9 +142,9 @@ impl Default for C_with_incomplete_array {
 #[repr(C)]
 pub struct C_with_zero_length_array_and_incomplete_array {
     pub a: ::std::os::raw::c_int,
-    pub big_array: [::std::os::raw::c_char; 33usize],
-    pub zero_length_array: __IncompleteArrayField<::std::os::raw::c_char>,
-    pub incomplete_array: __IncompleteArrayField<::std::os::raw::c_char>,
+    pub big_array: [::std::os::raw::c_schar; 33usize],
+    pub zero_length_array: __IncompleteArrayField<::std::os::raw::c_schar>,
+    pub incomplete_array: __IncompleteArrayField<::std::os::raw::c_schar>,
 }
 #[test]
 fn bindgen_test_layout_C_with_zero_length_array_and_incomplete_array() {
diff --git a/tests/expectations/tests/class_with_typedef.rs b/tests/expectations/tests/class_with_typedef.rs
@@ -15,7 +15,7 @@ pub struct C {
     pub other_ptr: *mut AnotherInt,
 }
 pub type C_MyInt = ::std::os::raw::c_int;
-pub type C_Lookup = *const ::std::os::raw::c_char;
+pub type C_Lookup = *const ::std::os::raw::c_schar;
 #[test]
 fn bindgen_test_layout_C() {
     assert_eq!(::std::mem::size_of::<C>() , 72usize , concat ! (
diff --git a/tests/expectations/tests/constant-evaluate.rs b/tests/expectations/tests/constant-evaluate.rs
@@ -14,7 +14,7 @@ pub const k: EasyToOverflow = 2147483648;
 pub const k_expr: EasyToOverflow = 0;
 pub const BAZ: ::std::os::raw::c_longlong = 24;
 pub const fuzz: f64 = 51.;
-pub const BAZZ: ::std::os::raw::c_char = 53;
-pub const WAT: ::std::os::raw::c_char = 0;
+pub const BAZZ: ::std::os::raw::c_schar = 53;
+pub const WAT: ::std::os::raw::c_schar = 0;
 pub const bytestring: &'static [u8; 4usize] = b"Foo\x00";
 pub const NOT_UTF8: [u8; 5usize] = [240, 40, 140, 40, 0];
diff --git a/tests/expectations/tests/inline_namespace_whitelist.rs b/tests/expectations/tests/inline_namespace_whitelist.rs
@@ -10,6 +10,6 @@ pub mod root {
     pub mod std {
         #[allow(unused_imports)]
         use self::super::super::root;
-        pub type string = *const ::std::os::raw::c_char;
+        pub type string = *const ::std::os::raw::c_schar;
     }
 }
diff --git a/tests/expectations/tests/issue-493.rs b/tests/expectations/tests/issue-493.rs
@@ -37,7 +37,7 @@ pub struct basic_string<_CharT, _Traits, _Allocator> {
     pub _phantom_2: ::std::marker::PhantomData<_Allocator>,
 }
 pub type basic_string_size_type = ::std::os::raw::c_ulonglong;
-pub type basic_string_value_type = ::std::os::raw::c_char;
+pub type basic_string_value_type = ::std::os::raw::c_schar;
 pub type basic_string_pointer = *mut basic_string_value_type;
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
diff --git a/tests/expectations/tests/layout.rs b/tests/expectations/tests/layout.rs
@@ -40,7 +40,7 @@ impl <T> ::std::marker::Copy for __IncompleteArrayField<T> { }
 #[repr(C, packed)]
 #[derive(Debug, Default, Copy)]
 pub struct header {
-    pub proto: ::std::os::raw::c_char,
+    pub proto: ::std::os::raw::c_schar,
     pub size: ::std::os::raw::c_uint,
     pub data: __IncompleteArrayField<::std::os::raw::c_uchar>,
     pub __bindgen_padding_0: [u8; 11usize],
diff --git a/tests/expectations/tests/layout_array.rs b/tests/expectations/tests/layout_array.rs
@@ -58,7 +58,7 @@ pub type rte_mempool_get_count =
 #[derive(Debug, Copy)]
 pub struct rte_mempool_ops {
     /**< Name of mempool ops struct. */
-    pub name: [::std::os::raw::c_char; 32usize],
+    pub name: [::std::os::raw::c_schar; 32usize],
     /**< Allocate private data. */
     pub alloc: rte_mempool_alloc_t,
     /**< Free the external pool. */
diff --git a/tests/expectations/tests/layout_cmdline_token.rs b/tests/expectations/tests/layout_cmdline_token.rs
@@ -64,7 +64,7 @@ pub struct cmdline_token_ops {
     pub parse: ::std::option::Option<unsafe extern "C" fn(arg1:
                                                               *mut cmdline_parse_token_hdr_t,
                                                           arg2:
-                                                              *const ::std::os::raw::c_char,
+                                                              *const ::std::os::raw::c_schar,
                                                           arg3:
                                                               *mut ::std::os::raw::c_void,
                                                           arg4:
@@ -80,15 +80,15 @@ pub struct cmdline_token_ops {
                                                                      arg2:
                                                                          ::std::os::raw::c_int,
                                                                      arg3:
-                                                                         *mut ::std::os::raw::c_char,
+                                                                         *mut ::std::os::raw::c_schar,
                                                                      arg4:
                                                                          ::std::os::raw::c_uint)
                                                     -> ::std::os::raw::c_int>,
     /** get help for this token (token, dstbuf, size) */
     pub get_help: ::std::option::Option<unsafe extern "C" fn(arg1:
                                                                  *mut cmdline_parse_token_hdr_t,
                                                              arg2:
-                                                                 *mut ::std::os::raw::c_char,
+                                                                 *mut ::std::os::raw::c_schar,
                                                              arg3:
                                                                  ::std::os::raw::c_uint)
                                             -> ::std::os::raw::c_int>,
diff --git a/tests/expectations/tests/layout_kni_mbuf.rs b/tests/expectations/tests/layout_kni_mbuf.rs
@@ -11,22 +11,22 @@ pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64;
 pub struct rte_kni_mbuf {
     pub buf_addr: *mut ::std::os::raw::c_void,
     pub buf_physaddr: u64,
-    pub pad0: [::std::os::raw::c_char; 2usize],
+    pub pad0: [::std::os::raw::c_schar; 2usize],
     /**< Start address of data in segment buffer. */
     pub data_off: u16,
-    pub pad1: [::std::os::raw::c_char; 2usize],
+    pub pad1: [::std::os::raw::c_schar; 2usize],
     /**< Number of segments. */
     pub nb_segs: u8,
-    pub pad4: [::std::os::raw::c_char; 1usize],
+    pub pad4: [::std::os::raw::c_schar; 1usize],
     /**< Offload features. */
     pub ol_flags: u64,
-    pub pad2: [::std::os::raw::c_char; 4usize],
+    pub pad2: [::std::os::raw::c_schar; 4usize],
     /**< Total pkt len: sum of all segment data_len. */
     pub pkt_len: u32,
     /**< Amount of data in segment buffer. */
     pub data_len: u16,
     pub __bindgen_padding_0: [u8; 22usize],
-    pub pad3: [::std::os::raw::c_char; 8usize],
+    pub pad3: [::std::os::raw::c_schar; 8usize],
     pub pool: *mut ::std::os::raw::c_void,
     pub next: *mut ::std::os::raw::c_void,
     pub __bindgen_padding_1: [u64; 5usize],
diff --git a/tests/expectations/tests/objc_method.rs b/tests/expectations/tests/objc_method.rs
@@ -20,7 +20,7 @@ pub trait Foo {
     unsafe fn methodWithArg1_andArg2_andArg3_(self,
                                               intvalue: ::std::os::raw::c_int,
                                               ptr:
-                                                  *mut ::std::os::raw::c_char,
+                                                  *mut ::std::os::raw::c_schar,
                                               floatvalue: f32);
 }
 impl Foo for id {
@@ -40,7 +40,7 @@ impl Foo for id {
     unsafe fn methodWithArg1_andArg2_andArg3_(self,
                                               intvalue: ::std::os::raw::c_int,
                                               ptr:
-                                                  *mut ::std::os::raw::c_char,
+                                                  *mut ::std::os::raw::c_schar,
                                               floatvalue: f32) {
         msg_send!(self ,
                   methodWithArg1:intvalue andArg2:ptr andArg3:floatvalue )
diff --git a/tests/expectations/tests/overloading.rs b/tests/expectations/tests/overloading.rs
@@ -6,7 +6,7 @@
 
 extern "C" {
     #[link_name = "_Z8Evaluatec"]
-    pub fn Evaluate(r: ::std::os::raw::c_char) -> bool;
+    pub fn Evaluate(r: ::std::os::raw::c_schar) -> bool;
 }
 extern "C" {
     #[link_name = "_Z8Evaluateii"]
diff --git a/tests/expectations/tests/struct_with_packing.rs b/tests/expectations/tests/struct_with_packing.rs
@@ -7,7 +7,7 @@
 #[repr(C, packed)]
 #[derive(Debug, Default, Copy)]
 pub struct a {
-    pub b: ::std::os::raw::c_char,
+    pub b: ::std::os::raw::c_schar,
     pub c: ::std::os::raw::c_short,
 }
 #[test]
diff --git a/tests/expectations/tests/union_with_big_member.rs b/tests/expectations/tests/union_with_big_member.rs
@@ -62,7 +62,7 @@ impl Default for WithBigArray {
 #[derive(Debug, Default, Copy)]
 pub struct WithBigArray2 {
     pub a: __BindgenUnionField<::std::os::raw::c_int>,
-    pub b: __BindgenUnionField<[::std::os::raw::c_char; 33usize]>,
+    pub b: __BindgenUnionField<[::std::os::raw::c_schar; 33usize]>,
     pub bindgen_union_field: [u32; 9usize],
 }
 #[test]
diff --git a/tests/expectations/tests/variadic-method.rs b/tests/expectations/tests/variadic-method.rs
@@ -6,7 +6,7 @@
 
 extern "C" {
     #[link_name = "_Z3fooPKcz"]
-    pub fn foo(fmt: *const ::std::os::raw::c_char, ...);
+    pub fn foo(fmt: *const ::std::os::raw::c_schar, ...);
 }
 #[repr(C)]
 #[derive(Debug, Default, Copy)]
@@ -22,7 +22,7 @@ fn bindgen_test_layout_Bar() {
 }
 extern "C" {
     #[link_name = "_ZN3Bar3fooEPKcz"]
-    pub fn Bar_foo(this: *mut Bar, fmt: *const ::std::os::raw::c_char, ...);
+    pub fn Bar_foo(this: *mut Bar, fmt: *const ::std::os::raw::c_schar, ...);
 }
 impl Clone for Bar {
     fn clone(&self) -> Self { *self }

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`	`8`	`#[link_name = "_Z3fooPKc"]`
`9`		`- pub fn foo(type_: *const ::std::os::raw::c_char);`
	`9`	`+ pub fn foo(type_: *const ::std::os::raw::c_schar);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ impl ::std::ops::BitOr<Buz> for Buz {`
`33`	`33`	`}`
`34`	`34`	`#[repr(C)]`
`35`	`35`	`#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]`
`36`		`-pub struct Buz(pub ::std::os::raw::c_char);`
	`36`	`+pub struct Buz(pub ::std::os::raw::c_schar);`
`37`	`37`	`pub const NS_FOO: _bindgen_ty_1 = _bindgen_ty_1(1);`
`38`	`38`	`pub const NS_BAR: _bindgen_ty_1 = _bindgen_ty_1(2);`
`39`	`39`	`impl ::std::ops::BitOr<_bindgen_ty_1> for _bindgen_ty_1 {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ pub struct C {`
`15`	`15`	`pub other_ptr: *mut AnotherInt,`
`16`	`16`	`}`
`17`	`17`	`pub type C_MyInt = ::std::os::raw::c_int;`
`18`		`-pub type C_Lookup = *const ::std::os::raw::c_char;`
	`18`	`+pub type C_Lookup = *const ::std::os::raw::c_schar;`
`19`	`19`	`#[test]`
`20`	`20`	`fn bindgen_test_layout_C() {`
`21`	`21`	`assert_eq!(::std::mem::size_of::<C>() , 72usize , concat ! (`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ pub mod root {`
`10`	`10`	`pub mod std {`
`11`	`11`	`#[allow(unused_imports)]`
`12`	`12`	`use self::super::super::root;`
`13`		`- pub type string = *const ::std::os::raw::c_char;`
	`13`	`+ pub type string = *const ::std::os::raw::c_schar;`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ pub struct basic_string<_CharT, _Traits, _Allocator> {`
`37`	`37`	`pub _phantom_2: ::std::marker::PhantomData<_Allocator>,`
`38`	`38`	`}`
`39`	`39`	`pub type basic_string_size_type = ::std::os::raw::c_ulonglong;`
`40`		`-pub type basic_string_value_type = ::std::os::raw::c_char;`
	`40`	`+pub type basic_string_value_type = ::std::os::raw::c_schar;`
`41`	`41`	`pub type basic_string_pointer = *mut basic_string_value_type;`
`42`	`42`	`#[repr(C)]`
`43`	`43`	`#[derive(Debug, Copy, Clone)]`