split BindgenOptions

Author: pvdrz

src/builder.rs

@@ -116,7 +116,7 @@ pub fn integer_type(
 pub fn bitfield_unit(ctx: &BindgenContext, layout: Layout) -> TokenStream {
     let mut tokens = quote! {};
 
-    if ctx.options().enable_cxx_namespaces {
+    if ctx.inputs().enable_cxx_namespaces {
         tokens.append_all(quote! { root:: });
     }
 
@@ -138,16 +138,16 @@ pub mod ast_ty {
 
     pub fn c_void(ctx: &BindgenContext) -> TokenStream {
         // ctypes_prefix takes precedence
-        match ctx.options().ctypes_prefix {
+        match ctx.inputs().ctypes_prefix {
             Some(ref prefix) => {
                 let prefix = TokenStream::from_str(prefix.as_str()).unwrap();
                 quote! {
                     #prefix::c_void
                 }
             }
             None => {
-                if ctx.options().use_core &&
-                    ctx.options().rust_features.core_ffi_c_void
+                if ctx.inputs().use_core &&
+                    ctx.inputs().rust_features().core_ffi_c_void
                 {
                     quote! { ::core::ffi::c_void }
                 } else {
@@ -159,16 +159,16 @@ pub mod ast_ty {
 
     pub fn raw_type(ctx: &BindgenContext, name: &str) -> TokenStream {
         let ident = ctx.rust_ident_raw(name);
-        match ctx.options().ctypes_prefix {
+        match ctx.inputs().ctypes_prefix {
             Some(ref prefix) => {
                 let prefix = TokenStream::from_str(prefix.as_str()).unwrap();
                 quote! {
                     #prefix::#ident
                 }
             }
             None => {
-                if ctx.options().use_core &&
-                    ctx.options().rust_features().core_ffi_c
+                if ctx.inputs().use_core &&
+                    ctx.inputs().rust_features().core_ffi_c
                 {
                     quote! {
                         ::core::ffi::#ident
@@ -191,7 +191,7 @@ pub mod ast_ty {
         // often?
         //
         // Also, maybe this one shouldn't be the default?
-        match (fk, ctx.options().convert_floats) {
+        match (fk, ctx.inputs().convert_floats) {
             (FloatKind::Float, true) => quote! { f32 },
             (FloatKind::Double, true) => quote! { f64 },
             (FloatKind::Float, false) => raw_type(ctx, "c_float"),
@@ -218,7 +218,7 @@ pub mod ast_ty {
                 }
             }
             (FloatKind::Float128, _) => {
-                if ctx.options().rust_features.i128_and_u128 {
+                if ctx.inputs().rust_features().i128_and_u128 {
                     quote! { u128 }
                 } else {
                     quote! { [u64; 2] }

src/codegen/helpers.rs

@@ -181,11 +181,11 @@ impl<'a> ImplDebug<'a> for Item {
                         vec![],
                     ))
                 } else if len < RUST_DERIVE_IN_ARRAY_LIMIT ||
-                    ctx.options().rust_features().larger_arrays
+                    ctx.inputs().rust_features().larger_arrays
                 {
                     // The simple case
                     debug_print(name, quote! { #name_ident })
-                } else if ctx.options().use_core {
+                } else if ctx.inputs().use_core {
                     // There is no String in core; reducing field visibility to avoid breaking
                     // no_std setups.
                     Some((format!("{}: [...]", name), vec![]))
@@ -204,7 +204,7 @@ impl<'a> ImplDebug<'a> for Item {
                 }
             }
             TypeKind::Vector(_, len) => {
-                if ctx.options().use_core {
+                if ctx.inputs().use_core {
                     // There is no format! in core; reducing field visibility to avoid breaking
                     // no_std setups.
                     Some((format!("{}(...)", name), vec![]))

src/codegen/impl_debug.rs

@@ -18,7 +18,7 @@ pub fn gen_partialeq_impl(
             &self._bindgen_opaque_blob[..] == &other._bindgen_opaque_blob[..]
         });
     } else if comp_info.kind() == CompKind::Union {
-        assert!(!ctx.options().rust_features().untagged_union);
+        assert!(!ctx.inputs().rust_features().untagged_union);
         tokens.push(quote! {
             &self.bindgen_union_field[..] == &other.bindgen_union_field[..]
         });
@@ -114,7 +114,7 @@ fn gen_field(
 
         TypeKind::Array(_, len) => {
             if len <= RUST_DERIVE_IN_ARRAY_LIMIT ||
-                ctx.options().rust_features().larger_arrays
+                ctx.inputs().rust_features().larger_arrays
             {
                 quote_equals(name_ident)
             } else {