Be sure to treat &str as UTF8

mozilla · Nov 9, 2017 · a0068c6 · a0068c6
1 parent 8279373
commit a0068c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/compile-tests/constant.rs b/compile-tests/constant.rs
@@ -1,5 +1,6 @@
 const FOO: i32 = 10;
-const BAR: &'static libc::c_char = "hello world";
+const BAR: &'static str = "hello world";
+const ZOM: f32 = 3.14;
 
 #[repr(C)]
 struct Foo {

diff --git a/src/bindgen/ir/constant.rs b/src/bindgen/ir/constant.rs
@@ -19,7 +19,7 @@ impl LiteralExpr {
     pub fn load(expr: &syn::Expr) -> Result<LiteralExpr, String> {
         match &expr.node {
             &syn::ExprKind::Lit(syn::Lit::Str(ref text, ..)) => {
-                Ok(LiteralExpr(format!("\"{}\"", text)))
+                Ok(LiteralExpr(format!("u8\"{}\"", text)))
             }
             &syn::ExprKind::Lit(syn::Lit::Byte(value)) => {
                 Ok(LiteralExpr(format!("{}", value)))

diff --git a/src/bindgen/ir/ty.rs b/src/bindgen/ir/ty.rs
@@ -45,6 +45,7 @@ pub enum PrimitiveType {
     Float,
     Double,
     SizeT,
+    Str,
 }
 
 impl PrimitiveType {
@@ -79,6 +80,7 @@ impl PrimitiveType {
             "f32" => Some(PrimitiveType::Float),
             "f64" => Some(PrimitiveType::Double),
             "size_t" => Some(PrimitiveType::SizeT),
+            "str" => Some(PrimitiveType::Str),
             _ => None,
         }
     }
@@ -112,6 +114,7 @@ impl PrimitiveType {
             &PrimitiveType::Float => "f32",
             &PrimitiveType::Double => "f64",
             &PrimitiveType::SizeT => "size_t",
+            &PrimitiveType::Str => "str",
         }
     }
 
@@ -144,6 +147,7 @@ impl PrimitiveType {
             &PrimitiveType::Float => "float",
             &PrimitiveType::Double => "double",
             &PrimitiveType::SizeT => "size_t",
+            &PrimitiveType::Str => "char",
         }
     }