src/bindgen/ir/annotation.rs

@@ -58,7 +58,7 @@ impl AnnotationSet {
                 {
                     let comment = comment.value();
                     if &*ident.to_string() == "doc" {
-                        let line = comment.trim_left_matches("///").trim();
+                        let line = comment.trim_start_matches("///").trim();
                         if line.starts_with("cbindgen:") {
                             lines.push(line.to_owned());
                         }

src/bindgen/ir/documentation.rs

@@ -38,11 +38,11 @@ impl Documentation {
                     if &*name == "doc" {
                         let line = if attr.is_sugared_doc {
                             comment
-                                .trim_left_matches("/// ")
-                                .trim_left_matches("///")
-                                .trim_right()
+                                .trim_start_matches("/// ")
+                                .trim_start_matches("///")
+                                .trim_end()
                         } else {
-                            comment.trim_left_matches(" ").trim_right()
+                            comment.trim_start_matches(" ").trim_end()
                         };
                         if !line.starts_with("cbindgen:") {
                             doc.push(line.to_owned());

src/bindgen/ir/ty.rs

@@ -45,6 +45,7 @@ pub enum PrimitiveType {
     Int64,
     Float,
     Double,
+    VaList,
     //SizeT,
 }
 
@@ -79,6 +80,7 @@ impl PrimitiveType {
             "i64" | "int64_t" => Some(PrimitiveType::Int64),
             "f32" => Some(PrimitiveType::Float),
             "f64" => Some(PrimitiveType::Double),
+            "VaList" => Some(PrimitiveType::VaList),
             //"size_t" => Some(PrimitiveType::SizeT),
             _ => None,
         }
@@ -112,6 +114,7 @@ impl PrimitiveType {
             &PrimitiveType::Int64 => "i64",
             &PrimitiveType::Float => "f32",
             &PrimitiveType::Double => "f64",
+            &PrimitiveType::VaList => "va_list",
             //&PrimitiveType::SizeT => "size_t",
         }
     }
@@ -144,6 +147,7 @@ impl PrimitiveType {
             &PrimitiveType::Int64 => "int64_t",
             &PrimitiveType::Float => "float",
             &PrimitiveType::Double => "double",
+            &PrimitiveType::VaList => "va_list",
             //&PrimitiveType::SizeT => "size_t",
         }
     }