Rename native_code_generation_path to wrapper_code_generation_path

Author: Abestanis

CHANGELOG.md

@@ -194,8 +194,8 @@
   `CargoCallbacks` constant was added to mitigate the breaking nature of this
   change. This constant has been marked as deprecated and users will have to
   use the new `CargoCallbacks::new` method in the future.
-- Renamed `--wrap-static-fns-path` argument to `--native-code-generation-path` and the
-  corresponding `wrap_static_fns_path` builder function to `native_code_generation_path`.
+- Renamed `--wrap-static-fns-path` argument to `-wrapper-code-generation-path` and the
+  corresponding `wrap_static_fns_path` builder function to `wrapper_code_generation_path`.
 ## Removed
 ## Fixed
 - Allow compiling `bindgen-cli` with a static libclang.

bindgen-cli/options.rs

@@ -413,9 +413,9 @@ struct BindgenCommand {
     /// Generate wrappers for `static` and `static inline` functions.
     #[arg(long, requires = "experimental")]
     wrap_static_fns: bool,
-    /// Sets the path of the file where generated native code will be emitted.
+    /// Sets the path of the file where generated code for wrapper functions will be emitted.
     #[arg(long, requires = "experimental", value_name = "PATH")]
-    native_code_generation_path: Option<PathBuf>,
+    wrapper_code_generation_path: Option<PathBuf>,
     /// Sets the SUFFIX added to the extern wrapper functions generated for `static` and `static
     /// inline` functions.
     #[arg(long, requires = "experimental", value_name = "SUFFIX")]
@@ -559,7 +559,7 @@ where
         with_derive_custom_enum,
         with_derive_custom_union,
         wrap_static_fns,
-        native_code_generation_path,
+        wrapper_code_generation_path,
         wrap_static_fns_suffix,
         macro_function,
         default_visibility,
@@ -1095,8 +1095,8 @@ where
         builder = builder.wrap_static_fns(true);
     }
 
-    if let Some(path) = native_code_generation_path {
-        builder = builder.native_code_generation_path(path);
+    if let Some(path) = wrapper_code_generation_path {
+        builder = builder.wrapper_code_generation_path(path);
     }
 
     if let Some(suffix) = wrap_static_fns_suffix {

bindgen-integration/build.rs

@@ -234,7 +234,7 @@ fn setup_wrap_static_fns_test() {
         .parse_callbacks(Box::new(CargoCallbacks))
         .parse_callbacks(Box::new(WrappedVaListCallback))
         .wrap_static_fns(true)
-        .native_code_generation_path(
+        .wrapper_code_generation_path(
             out_path.join("wrap_static_fns").display().to_string(),
         )
         .clang_arg("-DUSE_VA_HEADER")

bindgen-tests/tests/tests.rs

@@ -656,7 +656,7 @@ fn test_wrap_static_fns() {
     let _bindings = Builder::default()
         .header("tests/headers/wrap-static-fns.h")
         .wrap_static_fns(true)
-        .native_code_generation_path(generated_path.display().to_string())
+        .wrapper_code_generation_path(generated_path.display().to_string())
         .parse_callbacks(Box::new(parse_callbacks::WrapAsVariadicFn))
         .generate()
         .expect("Failed to generate bindings");
@@ -704,7 +704,7 @@ fn test_function_macros() {
             "CONDITIONAL_COMPLEX",
             FunctionType::new::<f32, (bool, u32)>(),
         )
-        .native_code_generation_path(generated_path.display().to_string())
+        .wrapper_code_generation_path(generated_path.display().to_string())
         .generate()
         .expect("Failed to generate bindings");
 

bindgen/codegen/mod.rs

@@ -4800,7 +4800,7 @@ pub(crate) mod utils {
 
         let path = context
             .options()
-            .native_code_generation_path
+            .wrapper_code_generation_path
             .as_ref()
             .map(PathBuf::from)
             .unwrap_or_else(|| {

bindgen/options/mod.rs

@@ -1997,7 +1997,7 @@ options! {
         as_args: "--wrap-static-fns-suffix",
     },
     /// The path of the file where generated native code will be emitted.
-    native_code_generation_path: Option<PathBuf> {
+    wrapper_code_generation_path: Option<PathBuf> {
         methods: {
             #[cfg(feature = "experimental")]
             /// Set the path for the source code file that would be created if any code
@@ -2012,12 +2012,12 @@ options! {
             ///
             /// The default path is `temp_dir/bindgen/extern`, where `temp_dir` is the path
             /// returned by [`std::env::temp_dir`] .
-            pub fn native_code_generation_path<T: AsRef<Path>>(mut self, path: T) -> Self {
-                self.options.native_code_generation_path = Some(path.as_ref().to_owned());
+            pub fn wrapper_code_generation_path<T: AsRef<Path>>(mut self, path: T) -> Self {
+                self.options.wrapper_code_generation_path = Some(path.as_ref().to_owned());
                 self
             }
         },
-        as_args: "--native-code-generation-path",
+        as_args: "--wrapper-code-generation-path",
     },
     /// A mapping of names to function types of registered functional macros
     /// for which a wrapping function should be generated.