address comments

1 files changed, 7 insertions, 20 deletions

diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 35646c0d..27ddcfea 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -14,7 +14,6 @@ use self::helpers::attributes;
 use self::struct_layout::StructLayoutTracker;
 
 use super::BindgenOptions;
-use super::CodegenConfig;
 
 use ir::analysis::{HasVtable, Sizedness};
 use ir::annotations::FieldAccessorKind;
@@ -1843,11 +1842,7 @@ impl CodeGenerator for CompInfo {
             }
 
             let mut method_names = Default::default();
-            if ctx
-                .options()
-                .codegen_config
-                .contains(CodegenConfig::METHODS)
-            {
+            if ctx.options().codegen_config.methods() {
                 for method in self.methods() {
                     assert!(method.kind() != MethodKind::Constructor);
                     method.codegen_method(
@@ -1860,11 +1855,7 @@ impl CodeGenerator for CompInfo {
                 }
             }
 
-            if ctx
-                .options()
-                .codegen_config
-                .contains(CodegenConfig::CONSTRUCTORS)
-            {
+            if ctx.options().codegen_config.constructors() {
                 for sig in self.constructors() {
                     Method::new(
                         MethodKind::Constructor,
@@ -1881,11 +1872,7 @@ impl CodeGenerator for CompInfo {
                 }
             }
 
-            if ctx
-                .options()
-                .codegen_config
-                .contains(CodegenConfig::DESTRUCTORS)
-            {
+            if ctx.options().codegen_config.destructors() {
                 if let Some((kind, destructor)) = self.destructor() {
                     debug_assert!(kind.is_destructor());
                     Method::new(kind, destructor, false).codegen_method(
@@ -1992,18 +1979,18 @@ impl MethodCodegen for Method {
             let cc = &ctx.options().codegen_config;
             match self.kind() {
                 MethodKind::Constructor => {
-                    cc.contains(CodegenConfig::CONSTRUCTORS)
+                    cc.constructors()
                 }
                 MethodKind::Destructor => {
-                    cc.contains(CodegenConfig::DESTRUCTORS)
+                    cc.destructors()
                 }
                 MethodKind::VirtualDestructor { .. } => {
-                    cc.contains(CodegenConfig::DESTRUCTORS)
+                    cc.destructors()
                 }
                 MethodKind::Static
                 | MethodKind::Normal
                 | MethodKind::Virtual { .. } => {
-                    cc.contains(CodegenConfig::METHODS)
+                    cc.methods()
                 }
             }
         });