diff options
| -rw-r--r-- | src/lib.rs | 8 | ||||
| -rw-r--r-- | src/options.rs | 14 | ||||
| -rw-r--r-- | tests/expectations/tests/namespace.rs | 1 | ||||
| -rw-r--r-- | tests/headers/namespace.hpp | 2 |
4 files changed, 24 insertions, 1 deletions
@@ -494,6 +494,14 @@ impl Builder { output_vector.push(line.clone()); } + for (module, lines) in &self.options.module_lines { + for line in lines.iter() { + output_vector.push("--module-raw-line".into()); + output_vector.push(module.clone()); + output_vector.push(line.clone()); + } + } + if self.options.use_core { output_vector.push("--use-core".into()); } diff --git a/src/options.rs b/src/options.rs index 657c3c9a..8beac469 100644 --- a/src/options.rs +++ b/src/options.rs @@ -338,6 +338,13 @@ where .takes_value(true) .multiple(true) .number_of_values(1), + Arg::with_name("module-raw-line") + .long("module-raw-line") + .help("Add a raw line of Rust code to a given module.") + .takes_value(true) + .multiple(true) + .number_of_values(2) + .value_names(&["module-name", "raw-line"]), Arg::with_name("rust-target") .long("rust-target") .help(&rust_target_help) @@ -769,6 +776,13 @@ where } } + if let Some(mut values) = matches.values_of("module-raw-line") { + while let Some(module) = values.next() { + let line = values.next().unwrap(); + builder = builder.module_raw_line(module, line); + } + } + if matches.is_present("use-core") { builder = builder.use_core(); } diff --git a/tests/expectations/tests/namespace.rs b/tests/expectations/tests/namespace.rs index d5d10e29..944ec5bb 100644 --- a/tests/expectations/tests/namespace.rs +++ b/tests/expectations/tests/namespace.rs @@ -16,6 +16,7 @@ pub mod root { pub mod whatever { #[allow(unused_imports)] use self::super::super::root; + pub type whatever_other_thing_t = whatever_int_t; pub type whatever_int_t = ::std::os::raw::c_int; extern "C" { #[link_name = "\u{1}_ZN8whatever11in_whateverEv"] diff --git a/tests/headers/namespace.hpp b/tests/headers/namespace.hpp index a8e6f8ec..7e4197da 100644 --- a/tests/headers/namespace.hpp +++ b/tests/headers/namespace.hpp @@ -1,4 +1,4 @@ -// bindgen-flags: --enable-cxx-namespaces +// bindgen-flags: --enable-cxx-namespaces --module-raw-line root::whatever 'pub type whatever_other_thing_t = whatever_int_t;' void top_level(); |