Revert "Add flag to ignore type blocklist when computing derive infor…

…mation"

This reverts commit 7286c81, because it
was not intended to be merged after all, see
#2003 (comment).

src/ir/analysis/derive.rs

@@ -138,9 +138,8 @@ impl<'ctx> CannotDerive<'ctx> {
     }
 
     fn constrain_type(&mut self, item: &Item, ty: &Type) -> CanDerive {
-        if !self.ctx.options().derive_ignore_blocklist &&
-            !self.ctx.allowlisted_items().contains(&item.id())
-        {            trace!(
+        if !self.ctx.allowlisted_items().contains(&item.id()) {
+            trace!(
                 "    cannot derive {} for blocklisted type",
                 self.derive_trait
             );

src/lib.rs

@@ -549,10 +549,6 @@ impl Builder {
             output_vector.push("--respect-cxx-access-specs".into());
         }
 
-        if self.options.derive_ignore_blocklist {
-            output_vector.push("--derive-ignore-blocklist".into());
-        }
-
         // Add clang arguments
 
         output_vector.push("--".into());
@@ -1572,12 +1568,6 @@ impl Builder {
         self.options.respect_cxx_access_specs = doit;
         self
     }
-
-    /// Ignore the type blocklist when computing type derive information
-    pub fn derive_ignore_blocklist(mut self, doit: bool) -> Self {
-        self.options.derive_ignore_blocklist = doit;
-        self
-    }
 }
 
 /// Configuration options for generated bindings.
@@ -1869,9 +1859,6 @@ struct BindgenOptions {
     /// Only make generated bindings `pub` if the items would be publically accessible
     /// by C++.
     respect_cxx_access_specs: bool,
-
-    /// Ignore the type blocklist when computing type derive information
-    derive_ignore_blocklist: bool,
 }
 
 /// TODO(emilio): This is sort of a lie (see the error message that results from
@@ -2009,7 +1996,6 @@ impl Default for BindgenOptions {
             wasm_import_module_name: None,
             dynamic_library_name: None,
             respect_cxx_access_specs: false,
-            derive_ignore_blocklist: false,
         }
     }
 }

src/options.rs

@@ -503,9 +503,6 @@ where
             Arg::with_name("respect-cxx-access-specs")
                 .long("respect-cxx-access-specs")
                 .help("Makes generated bindings `pub` only for items if the items are publically accessible in C++."),
-            Arg::with_name("derive-ignore-blocklist")
-                .long("derive-ignore-blocklist")
-                .help("Ignore the type blocklist when computing type derive information"),
         ]) // .args()
         .get_matches_from(args);
 
@@ -932,10 +929,6 @@ where
         builder = builder.respect_cxx_access_specs(true);
     }
 
-    if matches.is_present("derive-ignore-blocklist") {
-        builder = builder.derive_ignore_blocklist(true);
-    }
-
     let verbose = matches.is_present("verbose");
 
     Ok((builder, output, verbose))