src/bindgen/bindings.rs

@@ -133,11 +133,13 @@ impl Bindings {
             out.new_line();
         }
 
-        if self.config.language == Language::Cxx {
-            out.new_line_if_not_start();
-            out.write("extern \"C\" {");
-            out.new_line();
-        }
+        out.new_line_if_not_start();
+        out.write("#ifdef __cplusplus");
+        out.new_line();
+        out.write("extern \"C\" {");
+        out.new_line();
+        out.write("#endif");
+        out.new_line();
 
         for global in &self.globals {
             out.new_line_if_not_start();
@@ -157,11 +159,15 @@ impl Bindings {
             out.new_line();
         }
 
-        if self.config.language == Language::Cxx {
-            out.new_line_if_not_start();
-            out.write("} // extern \"C\"");
-            out.new_line();
+        out.new_line_if_not_start();
+        out.write("#ifdef __cplusplus");
+        out.new_line();
+        out.write("} // extern \"C\"");
+        out.new_line();
+        out.write("#endif");
+        out.new_line();
 
+        if self.config.language == Language::Cxx {
             self.close_namespaces(&mut out);
         }
 

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",
         }
     }

src/bindgen/parser.rs

@@ -313,12 +313,35 @@ impl Parser {
                         } else if next_mod_path2.exists() {
                             self.parse_mod(pkg, next_mod_path2.as_path())?;
                         } else {
+                            // Last chance to find a module path
+                            let mut path_attr_found = false;
+                            for attr in &item.attrs {
+                                if attr.is_sugared_doc {
+                                    continue;
+                                }
+
+                                match attr.interpret_meta() {
+                                    Some(syn::Meta::NameValue(syn::MetaNameValue { ident, lit, ..})) => {
+                                        match (ident.as_ref(), lit) {
+                                            ("path", syn::Lit::Str(ref path)) => {
+                                                path_attr_found = true;
+                                                self.parse_mod(pkg, &mod_dir.join(path.value()))?;
+                                            }
+                                            _ => (),
+                                        }
+                                    }
+                                    _ => (),
+                                }
+                            }
+
                             // This should be an error, but it's common enough to
                             // just elicit a warning
-                            warn!(
-                                "Parsing crate `{}`: can't find mod {}`.",
-                                pkg.name, next_mod_name
-                            );
+                            if !path_attr_found {
+                                warn!(
+                                    "Parsing crate `{}`: can't find mod {}`.",
+                                    pkg.name, next_mod_name
+                                );
+                            }
                         }
                     }
 

tests/expectations/mod_path.c

+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#define EXPORT_ME_TOO 42
+
+typedef struct {
+  uint64_t val;
+} ExportMe;
+
+void export_me(ExportMe *val);

tests/expectations/mod_path.cpp

+#include <cstdint>
+#include <cstdlib>
+
+static const uint8_t EXPORT_ME_TOO = 42;
+
+struct ExportMe {
+  uint64_t val;
+};
+
+extern "C" {
+
+void export_me(ExportMe *val);
+
+} // extern "C"

tests/rust/mod_path/Cargo.lock

+[[package]]
+name = "mod_path"
+version = "0.1.0"
+

tests/rust/mod_path/Cargo.toml

+[package]
+name = "mod_path"
+version = "0.1.0"
+authors = ["cbindgen"]
+
+[lib]
+name = "mod_path"
+crate-type = ["lib", "dylib"]

tests/rust/mod_path/cbindgen.toml

+[parse]
+parse_deps = false

tests/rust/mod_path/src/lib.rs

+#[path = "other.rs"]
+mod inner;
+
+pub use inner::*;

tests/rust/mod_path/src/other.rs

+#[repr(C)]
+pub struct ExportMe {
+    val: u64
+}
+
+#[repr(C)]
+pub struct DoNotExportMe {
+    val: u64
+}
+
+pub const EXPORT_ME_TOO: u8 = 0x2a;
+
+#[no_mangle]
+pub unsafe extern "C" fn export_me(val: *mut ExportMe) { }