No --remove-function-prefix flag

Author: justsmth

src/options.rs

@@ -1,40 +1,14 @@
-use bindgen::callbacks::ParseCallbacks;
 use bindgen::{
     builder, AliasVariation, Builder, CodegenConfig, EnumVariation,
     MacroTypeVariation, RustTarget, DEFAULT_ANON_FIELDS_PREFIX,
     RUST_TARGET_STRINGS,
 };
 use clap::{App, Arg};
-use std::fmt::Debug;
 use std::fs::File;
 use std::io::{self, stderr, Error, ErrorKind, Write};
 use std::path::PathBuf;
 use std::str::FromStr;
 
-#[derive(Debug)]
-pub struct LinkNameOverrideParseCallback {
-    pub remove_function_prefix: Option<String>,
-}
-
-impl LinkNameOverrideParseCallback {
-    pub fn new(prefix: &str) -> Self {
-        LinkNameOverrideParseCallback {
-            remove_function_prefix: Some(prefix.to_string()),
-        }
-    }
-}
-
-impl ParseCallbacks for LinkNameOverrideParseCallback {
-    fn generated_name_override(&self, function_name: &str) -> Option<String> {
-        if let Some(prefix) = &self.remove_function_prefix {
-            if function_name.starts_with(prefix) {
-                return Some(function_name[prefix.len()..].to_string());
-            }
-        }
-        None
-    }
-}
-
 /// Construct a new [`Builder`](./struct.Builder.html) from command line flags.
 pub fn builder_from_flags<I>(
     args: I,
@@ -571,11 +545,6 @@ where
             Arg::new("vtable-generation")
                 .long("vtable-generation")
                 .help("Enables generation of vtable functions."),
-            Arg::new("remove-function-prefix")
-                .long("remove-function-prefix")
-                .multiple_occurrences(true)
-                .takes_value(true)
-                .help("Remove prefix when generating Rust function name."),
             Arg::new("V")
                 .long("version")
                 .help("Prints the version, and exits"),
@@ -1061,11 +1030,6 @@ where
         builder = builder.vtable_generation(true);
     }
 
-    if let Some(prefix) = matches.value_of("remove-function-prefix") {
-        let lnopc = LinkNameOverrideParseCallback::new(prefix);
-        builder = builder.parse_callbacks(Box::new(lnopc));
-    }
-
     let verbose = matches.is_present("verbose");
 
     Ok((builder, output, verbose))

tests/headers/issue-1375-prefixed-functions.h

@@ -1,4 +1,3 @@
-// bindgen-flags: --remove-function-prefix my_custom_prefix_
 // bindgen-parse-callbacks: remove-function-prefix-my_custom_prefix_
 
 void my_custom_prefix_function_name(const int x);

tests/parse_callbacks/mod.rs

@@ -1,6 +1,29 @@
-use crate::options::LinkNameOverrideParseCallback;
 use bindgen::callbacks::*;
 
+#[derive(Debug)]
+pub struct RemoveFunctionPrefixParseCallback {
+    pub remove_function_prefix: Option<String>,
+}
+
+impl RemoveFunctionPrefixParseCallback {
+    pub fn new(prefix: &str) -> Self {
+        RemoveFunctionPrefixParseCallback {
+            remove_function_prefix: Some(prefix.to_string()),
+        }
+    }
+}
+
+impl ParseCallbacks for RemoveFunctionPrefixParseCallback {
+    fn generated_name_override(&self, function_name: &str) -> Option<String> {
+        if let Some(prefix) = &self.remove_function_prefix {
+            if function_name.starts_with(prefix) {
+                return Some(function_name[prefix.len()..].to_string());
+            }
+        }
+        None
+    }
+}
+
 #[derive(Debug)]
 struct EnumVariantRename;
 
@@ -44,7 +67,7 @@ pub fn lookup(cb: &str) -> Box<dyn ParseCallbacks> {
                     .split("remove-function-prefix-")
                     .last()
                     .to_owned();
-                let lnopc = LinkNameOverrideParseCallback::new(prefix.unwrap());
+                let lnopc = RemoveFunctionPrefixParseCallback::new(prefix.unwrap());
                 Box::new(lnopc)
             } else {
                 panic!("Couldn't find name ParseCallbacks: {}", cb)