Stop including <uchar.h>, and instead map Rust char to uint32_t.

This is technically a breaking change for C++, unfortunately.

Fixes #423.

Author: emilio

src/bindgen/bindings.rs

@@ -167,8 +167,6 @@ impl Bindings {
                 out.new_line();
                 out.write("#include <stdlib.h>");
                 out.new_line();
-                out.write("#include <uchar.h>");
-                out.new_line();
             } else {
                 out.write("#include <cstdarg>");
                 out.new_line();

src/bindgen/ir/ty.rs

@@ -132,7 +132,15 @@ impl PrimitiveType {
             PrimitiveType::Char => "char",
             PrimitiveType::SChar => "signed char",
             PrimitiveType::UChar => "unsigned char",
-            PrimitiveType::Char32 => "char32_t",
+            // NOTE: It'd be nice to use a char32_t, but:
+            //
+            //  * uchar.h is not present on mac (see #423).
+            //
+            //  * char32_t isn't required to be compatible with Rust's char, as
+            //    the C++ spec only requires it to be the same size as
+            //    uint_least32_t, which is _not_ guaranteed to be 4-bytes.
+            //
+            PrimitiveType::Char32 => "uint32_t",
             PrimitiveType::Short => "short",
             PrimitiveType::Int => "int",
             PrimitiveType::Long => "long",

tests/expectations/alias.c

@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 enum Status {
   Ok,

tests/expectations/alias.compat.c

@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 enum Status
 #ifdef __cplusplus

tests/expectations/annotation.c

@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 enum C {
   X = 2,

tests/expectations/annotation.compat.c

@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 enum C
 #ifdef __cplusplus

tests/expectations/array.c

@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 typedef enum {
   A,

tests/expectations/array.compat.c

@@ -2,7 +2,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 typedef enum {
   A,

tests/expectations/asserted-cast.c

@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 typedef struct I I;
 

tests/expectations/asserted-cast.compat.c

@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <uchar.h>
 
 typedef struct I I;