move user input fields to BindgenOptions

pvdrz · pvdrz · commit 91e0f3acb1e3 · 2022-09-05T16:53:03.000-05:00
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
@@ -15,8 +15,6 @@ use self::dyngen::DynamicItems;
 use self::helpers::attributes;
 use self::struct_layout::StructLayoutTracker;
 
-use super::BindgenState;
-
 use crate::ir::analysis::{HasVtable, Sizedness};
 use crate::ir::annotations::FieldAccessorKind;
 use crate::ir::comment;
@@ -47,7 +45,7 @@ use crate::ir::var::Var;
 use proc_macro2::{self, Ident, Span};
 use quote::TokenStreamExt;
 
-use crate::{Entry, HashMap, HashSet};
+use crate::{BindgenOptions, Entry, HashMap, HashSet};
 use std::borrow::Cow;
 use std::cell::Cell;
 use std::collections::VecDeque;
@@ -890,11 +888,11 @@ impl CodeGenerator for Type {
                     quote! {}
                 };
 
-                let alias_style = if ctx.options().type_alias.matches(&name) {
+                let alias_style = if ctx.state().type_alias.matches(&name) {
                     AliasVariation::TypeAlias
-                } else if ctx.options().new_type_alias.matches(&name) {
+                } else if ctx.state().new_type_alias.matches(&name) {
                     AliasVariation::NewType
-                } else if ctx.options().new_type_alias_deref.matches(&name) {
+                } else if ctx.state().new_type_alias_deref.matches(&name) {
                     AliasVariation::NewTypeDeref
                 } else {
                     ctx.options().default_alias_style
@@ -2073,7 +2071,7 @@ impl CodeGenerator for CompInfo {
         // The custom derives callback may return a list of derive attributes;
         // add them to the end of the list.
         let custom_derives;
-        if let Some(cb) = &ctx.options().parse_callbacks {
+        if let Some(cb) = &ctx.state().parse_callbacks {
             custom_derives = cb.add_derives(&canonical_name);
             // In most cases this will be a no-op, since custom_derives will be empty.
             derives.extend(custom_derives.iter().map(|s| s.as_str()));
@@ -3089,7 +3087,7 @@ impl CodeGenerator for Enum {
             // The custom derives callback may return a list of derive attributes;
             // add them to the end of the list.
             let custom_derives;
-            if let Some(cb) = &ctx.options().parse_callbacks {
+            if let Some(cb) = &ctx.state().parse_callbacks {
                 custom_derives = cb.add_derives(&name);
                 // In most cases this will be a no-op, since custom_derives will be empty.
                 derives.extend(custom_derives.iter().map(|s| s.as_str()));
@@ -4330,7 +4328,7 @@ impl CodeGenerator for ObjCInterface {
 
 pub(crate) fn codegen(
     context: BindgenContext,
-) -> (Vec<proc_macro2::TokenStream>, BindgenState, Vec<String>) {
+) -> (Vec<proc_macro2::TokenStream>, BindgenOptions, Vec<String>) {
     context.gen(|context| {
         let _t = context.timer("codegen");
         let counter = Cell::new(0);
diff --git a/src/deps.rs b/src/deps.rs
@@ -1,7 +1,7 @@
 /// Generating build depfiles from parsed bindings.
 use std::{collections::BTreeSet, path::PathBuf};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub(crate) struct DepfileSpec {
     pub output_module: String,
     pub depfile_path: PathBuf,
diff --git a/src/ir/context.rs b/src/ir/context.rs
@@ -22,7 +22,7 @@ use super::ty::{FloatKind, Type, TypeKind};
 use crate::callbacks::ParseCallbacks;
 use crate::clang::{self, Cursor};
 use crate::parse::ClangItemParser;
-use crate::BindgenState;
+use crate::{BindgenOptions, BindgenState};
 use crate::{Entry, HashMap, HashSet};
 use cexpr;
 use clang_sys;
@@ -371,7 +371,9 @@ pub struct BindgenContext {
     target_info: clang::TargetInfo,
 
     /// The options given by the user via cli or other medium.
-    options: BindgenState,
+    options: BindgenOptions,
+
+    state: BindgenState,
 
     /// Whether a bindgen complex was generated
     generated_bindgen_complex: Cell<bool>,
@@ -505,7 +507,7 @@ impl<'ctx> AllowlistedItemsTraversal<'ctx> {
 
 impl BindgenContext {
     /// Construct the context for the given `options`.
-    pub(crate) fn new(options: BindgenState) -> Self {
+    pub(crate) fn new(state: BindgenState, options: BindgenOptions) -> Self {
         // TODO(emilio): Use the CXTargetInfo here when available.
         //
         // see: https://reviews.llvm.org/D32389
@@ -522,7 +524,7 @@ impl BindgenContext {
                 &index,
                 "",
                 &options.clang_args,
-                &options.input_unsaved_files,
+                &state.input_unsaved_files,
                 parse_options,
             ).expect("libclang error; possible causes include:
 - Invalid flag syntax
@@ -561,6 +563,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
             translation_unit,
             target_info,
             options,
+            state,
             generated_bindgen_complex: Cell::new(false),
             allowlisted: None,
             blocklisted_types_implement_traits: Default::default(),
@@ -622,7 +625,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
 
     /// Get the user-provided callbacks by reference, if any.
     pub fn parse_callbacks(&self) -> Option<&dyn ParseCallbacks> {
-        self.options().parse_callbacks.as_deref()
+        self.state().parse_callbacks.as_deref()
     }
 
     /// Add another path to the set of included files.
@@ -1136,7 +1139,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
     pub(crate) fn gen<F, Out>(
         mut self,
         cb: F,
-    ) -> (Out, BindgenState, Vec<String>)
+    ) -> (Out, BindgenOptions, Vec<String>)
     where
         F: FnOnce(&Self) -> Out,
     {
@@ -2077,14 +2080,18 @@ If you encounter an error missing from this list, please file an issue or a PR!"
             self.in_codegen_phase(),
             "You're not supposed to call this yet"
         );
-        self.options.opaque_types.matches(&path[1..].join("::"))
+        self.state.opaque_types.matches(&path[1..].join("::"))
     }
 
     /// Get the options used to configure this bindgen context.
-    pub(crate) fn options(&self) -> &BindgenState {
+    pub(crate) fn options(&self) -> &BindgenOptions {
         &self.options
     }
 
+    pub(crate) fn state(&self) -> &BindgenState {
+        &self.state
+    }
+
     /// Tokenizes a namespace cursor in order to get the name and kind of the
     /// namespace.
     fn tokenize_namespace(
@@ -2242,7 +2249,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
             .or_insert_with(|| {
                 item.expect_type()
                     .name()
-                    .and_then(|name| match self.options.parse_callbacks {
+                    .and_then(|name| match self.state.parse_callbacks {
                         Some(ref cb) => cb.blocklisted_type_implements_trait(
                             name,
                             derive_trait,
@@ -2311,7 +2318,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
                             let (file, _, _, _) = location.location();
                             if let Some(filename) = file.name() {
                                 if self
-                                    .options()
+                                    .state()
                                     .allowlisted_files
                                     .matches(&filename)
                                 {
@@ -2326,13 +2333,13 @@ If you encounter an error missing from this list, please file an issue or a PR!"
                     match *item.kind() {
                         ItemKind::Module(..) => true,
                         ItemKind::Function(_) => {
-                            self.options().allowlisted_functions.matches(&name)
+                            self.state().allowlisted_functions.matches(&name)
                         }
                         ItemKind::Var(_) => {
-                            self.options().allowlisted_vars.matches(&name)
+                            self.state().allowlisted_vars.matches(&name)
                         }
                         ItemKind::Type(ref ty) => {
-                            if self.options().allowlisted_types.matches(&name) {
+                            if self.state().allowlisted_types.matches(&name) {
                                 return true;
                             }
 
@@ -2385,7 +2392,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
                                 );
                                 let name = prefix_path[1..].join("::");
                                 prefix_path.pop().unwrap();
-                                self.options().allowlisted_vars.matches(&name)
+                                self.state().allowlisted_vars.matches(&name)
                             })
                         }
                     }
@@ -2434,16 +2441,28 @@ If you encounter an error missing from this list, please file an issue or a PR!"
 
         let mut warnings = Vec::new();
 
-        for item in self.options().allowlisted_functions.unmatched_items() {
+        for item in self
+            .state()
+            .allowlisted_functions
+            .unmatched_items(&self.options().allowlisted_functions)
+        {
             warnings
                 .push(format!("unused option: --allowlist-function {}", item));
         }
 
-        for item in self.options().allowlisted_vars.unmatched_items() {
+        for item in self
+            .state()
+            .allowlisted_vars
+            .unmatched_items(&self.options().allowlisted_vars)
+        {
             warnings.push(format!("unused option: --allowlist-var {}", item));
         }
 
-        for item in self.options().allowlisted_types.unmatched_items() {
+        for item in self
+            .state()
+            .allowlisted_types
+            .unmatched_items(&self.options().allowlisted_types)
+        {
             warnings.push(format!("unused option: --allowlist-type {}", item));
         }
 
@@ -2667,37 +2686,37 @@ If you encounter an error missing from this list, please file an issue or a PR!"
     /// Check if `--no-partialeq` flag is enabled for this item.
     pub fn no_partialeq_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_partialeq_types.matches(&name)
+        self.state().no_partialeq_types.matches(&name)
     }
 
     /// Check if `--no-copy` flag is enabled for this item.
     pub fn no_copy_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_copy_types.matches(&name)
+        self.state().no_copy_types.matches(&name)
     }
 
     /// Check if `--no-debug` flag is enabled for this item.
     pub fn no_debug_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_debug_types.matches(&name)
+        self.state().no_debug_types.matches(&name)
     }
 
     /// Check if `--no-default` flag is enabled for this item.
     pub fn no_default_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_default_types.matches(&name)
+        self.state().no_default_types.matches(&name)
     }
 
     /// Check if `--no-hash` flag is enabled for this item.
     pub fn no_hash_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().no_hash_types.matches(&name)
+        self.state().no_hash_types.matches(&name)
     }
 
     /// Check if `--must-use-type` flag is enabled for this item.
     pub fn must_use_type_by_name(&self, item: &Item) -> bool {
         let name = item.path_for_allowlisting(self)[1..].join("::");
-        self.options().must_use_types.matches(&name)
+        self.state().must_use_types.matches(&name)
     }
 }
 
diff --git a/src/ir/enum_ty.rs b/src/ir/enum_ty.rs
@@ -178,38 +178,31 @@ impl Enum {
         // problems with overlapping match patterns.
         if self.is_matching_enum(
             ctx,
-            &ctx.options().constified_enum_modules,
+            &ctx.state().constified_enum_modules,
             item,
         ) {
             EnumVariation::ModuleConsts
-        } else if self.is_matching_enum(
-            ctx,
-            &ctx.options().bitfield_enums,
-            item,
-        ) {
-            EnumVariation::NewType { is_bitfield: true }
-        } else if self.is_matching_enum(ctx, &ctx.options().newtype_enums, item)
+        } else if self.is_matching_enum(ctx, &ctx.state().bitfield_enums, item)
         {
+            EnumVariation::NewType { is_bitfield: true }
+        } else if self.is_matching_enum(ctx, &ctx.state().newtype_enums, item) {
             EnumVariation::NewType { is_bitfield: false }
-        } else if self.is_matching_enum(
-            ctx,
-            &ctx.options().rustified_enums,
-            item,
-        ) {
+        } else if self.is_matching_enum(ctx, &ctx.state().rustified_enums, item)
+        {
             EnumVariation::Rust {
                 non_exhaustive: false,
             }
         } else if self.is_matching_enum(
             ctx,
-            &ctx.options().rustified_non_exhaustive_enums,
+            &ctx.state().rustified_non_exhaustive_enums,
             item,
         ) {
             EnumVariation::Rust {
                 non_exhaustive: true,
             }
         } else if self.is_matching_enum(
             ctx,
-            &ctx.options().constified_enums,
+            &ctx.state().constified_enums,
             item,
         ) {
             EnumVariation::Consts
diff --git a/src/ir/item.rs b/src/ir/item.rs
@@ -650,7 +650,7 @@ impl Item {
             if let Some(location) = &self.location {
                 let (file, _, _, _) = location.location();
                 if let Some(filename) = file.name() {
-                    if ctx.options().blocklisted_files.matches(&filename) {
+                    if ctx.state().blocklisted_files.matches(&filename) {
                         return true;
                     }
                 }
@@ -659,14 +659,14 @@ impl Item {
 
         let path = self.path_for_allowlisting(ctx);
         let name = path[1..].join("::");
-        ctx.options().blocklisted_items.matches(&name) ||
+        ctx.state().blocklisted_items.matches(&name) ||
             match self.kind {
                 ItemKind::Type(..) => {
-                    ctx.options().blocklisted_types.matches(&name) ||
+                    ctx.state().blocklisted_types.matches(&name) ||
                         ctx.is_replaced_type(path, self.id)
                 }
                 ItemKind::Function(..) => {
-                    ctx.options().blocklisted_functions.matches(&name)
+                    ctx.state().blocklisted_functions.matches(&name)
                 }
                 // TODO: Add constant / namespace blocklisting?
                 ItemKind::Var(..) | ItemKind::Module(..) => false,
@@ -887,7 +887,9 @@ impl Item {
                 true
             });
 
-        let ids: Vec<_> = if ctx.options().disable_nested_struct_naming {
+        let ids: Vec<_> = if ctx.options().enable_nested_struct_naming {
+            ids_iter.collect()
+        } else {
             let mut ids = Vec::new();
 
             // If target is anonymous we need find its first named ancestor.
@@ -902,8 +904,6 @@ impl Item {
             }
 
             ids
-        } else {
-            ids_iter.collect()
         };
 
         // Concatenate this item's ancestors' names together.
@@ -1924,7 +1924,7 @@ impl ItemCanonicalName for Item {
         self.canonical_name
             .borrow_with(|| {
                 let in_namespace = ctx.options().enable_cxx_namespaces ||
-                    ctx.options().disable_name_namespacing;
+                    !ctx.options().enable_name_namespacing;
 
                 if in_namespace {
                     self.name(ctx).within_namespaces().get()
@@ -1946,7 +1946,7 @@ impl ItemCanonicalPath for Item {
         // ASSUMPTION: (disable_name_namespacing && cxx_namespaces)
         // is equivalent to
         // disable_name_namespacing
-        if ctx.options().disable_name_namespacing {
+        if !ctx.options().enable_name_namespacing {
             // Only keep the last item in path
             let split_idx = path.len() - 1;
             path = path.split_off(split_idx);
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/regex_set.rs b/src/regex_set.rs
