summaryrefslogtreecommitdiff
path: root/bindgen-cli/options.rs
diff options
context:
space:
mode:
Diffstat (limited to 'bindgen-cli/options.rs')
-rw-r--r--bindgen-cli/options.rs486
1 files changed, 278 insertions, 208 deletions
diff --git a/bindgen-cli/options.rs b/bindgen-cli/options.rs
index f7fccc4f..f04d7268 100644
--- a/bindgen-cli/options.rs
+++ b/bindgen-cli/options.rs
@@ -3,7 +3,7 @@ use bindgen::{
MacroTypeVariation, NonCopyUnionStyle, RustTarget,
DEFAULT_ANON_FIELDS_PREFIX, RUST_TARGET_STRINGS,
};
-use clap::{App, Arg};
+use clap::{builder::PossibleValuesParser, Arg, ArgAction, Command};
use std::fs::File;
use std::io::{self, Error, ErrorKind};
use std::path::PathBuf;
@@ -22,9 +22,9 @@ where
String::from(RustTarget::default())
);
- let matches = App::new("bindgen")
+ let matches = Command::new("bindgen")
.about("Generates Rust bindings from C/C++ headers.")
- .setting(clap::AppSettings::NoAutoVersion)
+ .disable_version_flag(true)
.override_usage("bindgen [FLAGS] [OPTIONS] <header> -- <clang-args>...")
.args(&[
Arg::new("header")
@@ -32,22 +32,22 @@ where
.required_unless_present("V"),
Arg::new("depfile")
.long("depfile")
- .takes_value(true)
+ .action(ArgAction::Set)
.help("Path to write depfile to"),
Arg::new("default-enum-style")
.long("default-enum-style")
.help("The default style of code used to generate enums.")
.value_name("variant")
.default_value("consts")
- .possible_values([
+ .value_parser(PossibleValuesParser::new([
"consts",
"moduleconsts",
"bitfield",
"newtype",
"rust",
"rust_non_exhaustive",
- ])
- .multiple_occurrences(false),
+ ]))
+ .action(ArgAction::Set),
Arg::new("bitfield-enum")
.long("bitfield-enum")
.help(
@@ -55,25 +55,25 @@ where
bitfield flags.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("newtype-enum")
.long("newtype-enum")
.help("Mark any enum whose name matches <regex> as a newtype.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("newtype-global-enum")
.long("newtype-global-enum")
.help("Mark any enum whose name matches <regex> as a global newtype.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("rustified-enum")
.long("rustified-enum")
.help("Mark any enum whose name matches <regex> as a Rust enum.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("constified-enum")
.long("constified-enum")
@@ -82,7 +82,7 @@ where
constants.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("constified-enum-module")
.long("constified-enum-module")
@@ -91,26 +91,26 @@ where
constants.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("default-macro-constant-type")
.long("default-macro-constant-type")
.help("The default signed/unsigned type for C macro constants.")
.value_name("variant")
.default_value("unsigned")
- .possible_values(["signed", "unsigned"])
- .multiple_occurrences(false),
+ .value_parser(PossibleValuesParser::new(["signed", "unsigned"]))
+ .action(ArgAction::Set),
Arg::new("default-alias-style")
.long("default-alias-style")
.help("The default style of code used to generate typedefs.")
.value_name("variant")
.default_value("type_alias")
- .possible_values([
+ .value_parser(PossibleValuesParser::new([
"type_alias",
"new_type",
"new_type_deref",
- ])
- .multiple_occurrences(false),
+ ]))
+ .action(ArgAction::Set),
Arg::new("normal-alias")
.long("normal-alias")
.help(
@@ -118,7 +118,7 @@ where
normal type aliasing.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("new-type-alias")
.long("new-type-alias")
@@ -127,7 +127,7 @@ where
a new type generated for it.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("new-type-alias-deref")
.long("new-type-alias-deref")
@@ -136,7 +136,7 @@ where
a new type with Deref and DerefMut to the inner type.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("default-non-copy-union-style")
.long("default-non-copy-union-style")
@@ -147,11 +147,11 @@ where
)
.value_name("style")
.default_value("bindgen_wrapper")
- .possible_values([
+ .value_parser(PossibleValuesParser::new([
"bindgen_wrapper",
"manually_drop",
- ])
- .multiple_occurrences(false),
+ ]))
+ .action(ArgAction::Set),
Arg::new("bindgen-wrapper-union")
.long("bindgen-wrapper-union")
.help(
@@ -160,8 +160,7 @@ where
fields.",
)
.value_name("regex")
- .takes_value(true)
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("manually-drop-union")
.long("manually-drop-union")
@@ -171,86 +170,98 @@ where
1.20.0) for fields.",
)
.value_name("regex")
- .takes_value(true)
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("blocklist-type")
.long("blocklist-type")
.help("Mark <type> as hidden.")
.value_name("type")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("blocklist-function")
.long("blocklist-function")
.help("Mark <function> as hidden.")
.value_name("function")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("blocklist-item")
.long("blocklist-item")
.help("Mark <item> as hidden.")
.value_name("item")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("blocklist-file")
.long("blocklist-file")
.help("Mark all contents of <path> as hidden.")
.value_name("path")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("no-layout-tests")
.long("no-layout-tests")
- .help("Avoid generating layout tests for any type."),
+ .help("Avoid generating layout tests for any type.")
+ .action(ArgAction::SetTrue),
Arg::new("no-derive-copy")
.long("no-derive-copy")
- .help("Avoid deriving Copy on any type."),
+ .help("Avoid deriving Copy on any type.")
+ .action(ArgAction::SetTrue),
Arg::new("no-derive-debug")
.long("no-derive-debug")
- .help("Avoid deriving Debug on any type."),
+ .help("Avoid deriving Debug on any type.")
+ .action(ArgAction::SetTrue),
Arg::new("no-derive-default")
.long("no-derive-default")
.hide(true)
- .help("Avoid deriving Default on any type."),
+ .help("Avoid deriving Default on any type.")
+ .action(ArgAction::SetTrue),
Arg::new("impl-debug").long("impl-debug").help(
"Create Debug implementation, if it can not be derived \
automatically.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("impl-partialeq")
.long("impl-partialeq")
.help(
"Create PartialEq implementation, if it can not be derived \
automatically.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("with-derive-default")
.long("with-derive-default")
- .help("Derive Default on any type."),
+ .help("Derive Default on any type.")
+ .action(ArgAction::SetTrue),
Arg::new("with-derive-hash")
.long("with-derive-hash")
- .help("Derive hash on any type."),
+ .help("Derive hash on any type.")
+ .action(ArgAction::SetTrue),
Arg::new("with-derive-partialeq")
.long("with-derive-partialeq")
- .help("Derive partialeq on any type."),
+ .help("Derive partialeq on any type.")
+ .action(ArgAction::SetTrue),
Arg::new("with-derive-partialord")
.long("with-derive-partialord")
- .help("Derive partialord on any type."),
+ .help("Derive partialord on any type.")
+ .action(ArgAction::SetTrue),
Arg::new("with-derive-eq")
.long("with-derive-eq")
.help(
"Derive eq on any type. Enable this option also \
enables --with-derive-partialeq",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("with-derive-ord")
.long("with-derive-ord")
.help(
"Derive ord on any type. Enable this option also \
enables --with-derive-partialord",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("no-doc-comments")
.long("no-doc-comments")
.help(
"Avoid including doc comments in the output, see: \
https://github.com/rust-lang/rust-bindgen/issues/426",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("no-recursive-allowlist")
.long("no-recursive-allowlist")
.help(
@@ -258,23 +269,29 @@ where
bindgen to emit Rust code that won't compile! See the \
`bindgen::Builder::allowlist_recursively` method's \
documentation for details.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("objc-extern-crate")
.long("objc-extern-crate")
- .help("Use extern crate instead of use for objc."),
+ .help("Use extern crate instead of use for objc.")
+ .action(ArgAction::SetTrue),
Arg::new("generate-block")
.long("generate-block")
- .help("Generate block signatures instead of void pointers."),
+ .help("Generate block signatures instead of void pointers.")
+ .action(ArgAction::SetTrue),
Arg::new("block-extern-crate")
.long("block-extern-crate")
- .help("Use extern crate instead of use for block."),
+ .help("Use extern crate instead of use for block.")
+ .action(ArgAction::SetTrue),
Arg::new("distrust-clang-mangling")
.long("distrust-clang-mangling")
- .help("Do not trust the libclang-provided mangling"),
+ .help("Do not trust the libclang-provided mangling")
+ .action(ArgAction::SetTrue),
Arg::new("builtins").long("builtins").help(
"Output bindings for builtin definitions, e.g. \
__builtin_va_list.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("ctypes-prefix")
.long("ctypes-prefix")
.help(
@@ -289,51 +306,59 @@ where
.default_value(DEFAULT_ANON_FIELDS_PREFIX),
Arg::new("time-phases")
.long("time-phases")
- .help("Time the different bindgen phases and print to stderr"),
+ .help("Time the different bindgen phases and print to stderr")
+ .action(ArgAction::SetTrue),
// All positional arguments after the end of options marker, `--`
- Arg::new("clang-args").last(true).multiple_occurrences(true),
+ Arg::new("clang-args").last(true).action(ArgAction::Append),
Arg::new("emit-clang-ast")
.long("emit-clang-ast")
- .help("Output the Clang AST for debugging purposes."),
+ .help("Output the Clang AST for debugging purposes.")
+ .action(ArgAction::SetTrue),
Arg::new("emit-ir")
.long("emit-ir")
- .help("Output our internal IR for debugging purposes."),
+ .help("Output our internal IR for debugging purposes.")
+ .action(ArgAction::SetTrue),
Arg::new("emit-ir-graphviz")
.long("emit-ir-graphviz")
.help("Dump graphviz dot file.")
.value_name("path"),
Arg::new("enable-cxx-namespaces")
.long("enable-cxx-namespaces")
- .help("Enable support for C++ namespaces."),
+ .help("Enable support for C++ namespaces.")
+ .action(ArgAction::SetTrue),
Arg::new("disable-name-namespacing")
.long("disable-name-namespacing")
.help(
"Disable namespacing via mangling, causing bindgen to \
generate names like \"Baz\" instead of \"foo_bar_Baz\" \
for an input name \"foo::bar::Baz\".",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("disable-nested-struct-naming")
.long("disable-nested-struct-naming")
.help(
"Disable nested struct naming, causing bindgen to generate \
names like \"bar\" instead of \"foo_bar\" for a nested \
definition \"struct foo { struct bar { } b; };\"."
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("disable-untagged-union")
.long("disable-untagged-union")
.help(
"Disable support for native Rust unions.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("disable-header-comment")
.long("disable-header-comment")
.help("Suppress insertion of bindgen's version identifier into generated bindings.")
- .multiple_occurrences(true),
+ .action(ArgAction::SetTrue),
Arg::new("ignore-functions")
.long("ignore-functions")
.help(
"Do not generate bindings for functions or methods. This \
is useful when you only care about struct layouts.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("generate")
.long("generate")
.help(
@@ -341,60 +366,68 @@ where
Valid values are \"functions\",\"types\", \"vars\", \
\"methods\", \"constructors\" and \"destructors\".",
)
- .takes_value(true),
+ .action(ArgAction::Set),
Arg::new("ignore-methods")
.long("ignore-methods")
- .help("Do not generate bindings for methods."),
+ .help("Do not generate bindings for methods.")
+ .action(ArgAction::SetTrue),
Arg::new("no-convert-floats")
.long("no-convert-floats")
- .help("Do not automatically convert floats to f32/f64."),
+ .help("Do not automatically convert floats to f32/f64.")
+ .action(ArgAction::SetTrue),
Arg::new("no-prepend-enum-name")
.long("no-prepend-enum-name")
- .help("Do not prepend the enum name to constant or newtype variants."),
+ .help("Do not prepend the enum name to constant or newtype variants.")
+ .action(ArgAction::SetTrue),
Arg::new("no-include-path-detection")
.long("no-include-path-detection")
- .help("Do not try to detect default include paths"),
+ .help("Do not try to detect default include paths")
+ .action(ArgAction::SetTrue),
Arg::new("fit-macro-constant-types")
.long("fit-macro-constant-types")
- .help("Try to fit macro constants into types smaller than u32/i32"),
+ .help("Try to fit macro constants into types smaller than u32/i32")
+ .action(ArgAction::SetTrue),
Arg::new("opaque-type")
.long("opaque-type")
.help("Mark <type> as opaque.")
.value_name("type")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("output")
.short('o')
.long("output")
.help("Write Rust bindings to <output>.")
- .takes_value(true),
+ .action(ArgAction::Set),
Arg::new("raw-line")
.long("raw-line")
.help("Add a raw line of Rust code at the beginning of output.")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("module-raw-line")
.long("module-raw-line")
.help("Add a raw line of Rust code to a given module.")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(2)
.value_names(&["module-name", "raw-line"]),
Arg::new("rust-target")
.long("rust-target")
- .help(rust_target_help.as_ref())
- .takes_value(true),
+ .help(&rust_target_help)
+ .action(ArgAction::Set),
Arg::new("use-core")
.long("use-core")
- .help("Use types from Rust core instead of std."),
+ .help("Use types from Rust core instead of std.")
+ .action(ArgAction::SetTrue),
Arg::new("conservative-inline-namespaces")
.long("conservative-inline-namespaces")
.help(
"Conservatively generate inline namespaces to avoid name \
conflicts.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("use-msvc-mangling")
.long("use-msvc-mangling")
- .help("MSVC C++ ABI mangling. DEPRECATED: Has no effect."),
+ .help("MSVC C++ ABI mangling. DEPRECATED: Has no effect.")
+ .action(ArgAction::SetTrue),
Arg::new("allowlist-function")
.long("allowlist-function")
.help(
@@ -403,11 +436,12 @@ where
generated.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("generate-inline-functions")
.long("generate-inline-functions")
- .help("Generate inline functions."),
+ .help("Generate inline functions.")
+ .action(ArgAction::SetTrue),
Arg::new("allowlist-type")
.long("allowlist-type")
.help(
@@ -415,7 +449,7 @@ where
not be generated.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("allowlist-var")
.long("allowlist-var")
@@ -425,18 +459,19 @@ where
generated.",
)
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("allowlist-file")
.alias("allowlist-file")
.long("allowlist-file")
.help("Allowlist all contents of <path>.")
.value_name("path")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("verbose")
.long("verbose")
- .help("Print verbose error messages."),
+ .help("Print verbose error messages.")
+ .action(ArgAction::SetTrue),
Arg::new("dump-preprocessed-input")
.long("dump-preprocessed-input")
.help(
@@ -444,24 +479,29 @@ where
Useful when debugging bindgen, using C-Reduce, or when \
filing issues. The resulting file will be named \
something like `__bindgen.i` or `__bindgen.ii`.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("no-record-matches")
.long("no-record-matches")
.help(
"Do not record matching items in the regex sets. \
This disables reporting of unused items.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("size_t-is-usize")
.long("size_t-is-usize")
.help("Ignored - this is enabled by default.")
- .hidden(true),
- Arg::with_name("no-size_t-is-usize")
+ .hide(true)
+ .action(ArgAction::SetTrue),
+ Arg::new("no-size_t-is-usize")
.long("no-size_t-is-usize")
.help("Do not bind size_t as usize (useful on platforms \
- where those types are incompatible)."),
+ where those types are incompatible).")
+ .action(ArgAction::SetTrue),
Arg::new("no-rustfmt-bindings")
.long("no-rustfmt-bindings")
- .help("Do not format the generated bindings with rustfmt."),
+ .help("Do not format the generated bindings with rustfmt.")
+ .action(ArgAction::SetTrue),
Arg::new("rustfmt-bindings")
.long("rustfmt-bindings")
.help(
@@ -477,102 +517,114 @@ where
This parameter is incompatible with --no-rustfmt-bindings.",
)
.value_name("path")
- .multiple_occurrences(false)
+ .action(ArgAction::Set)
.number_of_values(1),
Arg::new("no-partialeq")
.long("no-partialeq")
.help("Avoid deriving PartialEq for types matching <regex>.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("no-copy")
.long("no-copy")
.help("Avoid deriving Copy for types matching <regex>.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("no-debug")
.long("no-debug")
.help("Avoid deriving Debug for types matching <regex>.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("no-default")
.long("no-default")
.help("Avoid deriving/implement Default for types matching <regex>.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("no-hash")
.long("no-hash")
.help("Avoid deriving Hash for types matching <regex>.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("must-use-type")
.long("must-use-type")
.help("Add #[must_use] annotation to types matching <regex>.")
.value_name("regex")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("enable-function-attribute-detection")
.long("enable-function-attribute-detection")
.help(
"Enables detecting unexposed attributes in functions (slow).
Used to generate #[must_use] annotations.",
- ),
+ )
+ .action(ArgAction::SetTrue),
Arg::new("use-array-pointers-in-arguments")
.long("use-array-pointers-in-arguments")
- .help("Use `*const [T; size]` instead of `*const T` for C arrays"),
+ .help("Use `*const [T; size]` instead of `*const T` for C arrays")
+ .action(ArgAction::SetTrue),
Arg::new("wasm-import-module-name")
.long("wasm-import-module-name")
.value_name("name")
.help("The name to be used in a #[link(wasm_import_module = ...)] statement"),
Arg::new("dynamic-loading")
.long("dynamic-loading")
- .takes_value(true)
+ .action(ArgAction::Set)
.help("Use dynamic loading mode with the given library name."),
Arg::new("dynamic-link-require-all")
.long("dynamic-link-require-all")
- .help("Require successful linkage to all functions in the library."),
+ .help("Require successful linkage to all functions in the library.")
+ .action(ArgAction::SetTrue),
Arg::new("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++."),
+ .help("Makes generated bindings `pub` only for items if the items are publically accessible in C++.")
+ .action(ArgAction::SetTrue),
Arg::new("translate-enum-integer-types")
.long("translate-enum-integer-types")
- .help("Always translate enum integer types to native Rust integer types."),
+ .help("Always translate enum integer types to native Rust integer types.")
+ .action(ArgAction::SetTrue),
Arg::new("c-naming")
.long("c-naming")
- .help("Generate types with C style naming."),
+ .help("Generate types with C style naming.")
+ .action(ArgAction::SetTrue),
Arg::new("explicit-padding")
.long("explicit-padding")
- .help("Always output explicit padding fields."),
+ .help("Always output explicit padding fields.")
+ .action(ArgAction::SetTrue),
Arg::new("vtable-generation")
.long("vtable-generation")
- .help("Enables generation of vtable functions."),
+ .help("Enables generation of vtable functions.")
+ .action(ArgAction::SetTrue),
Arg::new("sort-semantically")
.long("sort-semantically")
- .help("Enables sorting of code generation in a predefined manner."),
+ .help("Enables sorting of code generation in a predefined manner.")
+ .action(ArgAction::SetTrue),
Arg::new("merge-extern-blocks")
.long("merge-extern-blocks")
- .help("Deduplicates extern blocks."),
+ .help("Deduplicates extern blocks.")
+ .action(ArgAction::SetTrue),
Arg::new("override-abi")
.long("override-abi")
.help("Overrides the ABI of functions matching <regex>. The <override> value must be of the shape <regex>=<abi> where <abi> can be one of C, stdcall, fastcall, thiscall, aapcs, win64 or C-unwind.")
.value_name("override")
- .multiple_occurrences(true)
+ .action(ArgAction::Append)
.number_of_values(1),
Arg::new("wrap-unsafe-ops")
.long("wrap-unsafe-ops")
- .help("Wrap unsafe operations in unsafe blocks."),
+ .help("Wrap unsafe operations in unsafe blocks.")
+ .action(ArgAction::SetTrue),
Arg::new("V")
.long("version")
- .help("Prints the version, and exits"),
+ .help("Prints the version, and exits")
+ .action(ArgAction::SetTrue),
]) // .args()
.get_matches_from(args);
- let verbose = matches.is_present("verbose");
- if matches.is_present("V") {
+ let verbose = matches.get_flag("verbose");
+ if matches.get_flag("V") {
println!(
"bindgen {}",
option_env!("CARGO_PKG_VERSION").unwrap_or("unknown")
@@ -585,215 +637,229 @@ where
let mut builder = builder();
- if let Some(header) = matches.value_of("header") {
+ if let Some(header) = matches.get_one::<String>("header") {
builder = builder.header(header);
} else {
return Err(Error::new(ErrorKind::Other, "Header not found"));
}
- if let Some(rust_target) = matches.value_of("rust-target") {
+ if let Some(rust_target) = matches.get_one::<String>("rust-target") {
builder = builder.rust_target(RustTarget::from_str(rust_target)?);
}
- if let Some(variant) = matches.value_of("default-enum-style") {
+ if let Some(variant) = matches.get_one::<String>("default-enum-style") {
builder = builder.default_enum_style(EnumVariation::from_str(variant)?)
}
- if let Some(bitfields) = matches.values_of("bitfield-enum") {
+ if let Some(bitfields) = matches.get_many::<String>("bitfield-enum") {
for regex in bitfields {
builder = builder.bitfield_enum(regex);
}
}
- if let Some(newtypes) = matches.values_of("newtype-enum") {
+ if let Some(newtypes) = matches.get_many::<String>("newtype-enum") {
for regex in newtypes {
builder = builder.newtype_enum(regex);
}
}
- if let Some(newtypes) = matches.values_of("newtype-global-enum") {
+ if let Some(newtypes) = matches.get_many::<String>("newtype-global-enum") {
for regex in newtypes {
builder = builder.newtype_global_enum(regex);
}
}
- if let Some(rustifieds) = matches.values_of("rustified-enum") {
+ if let Some(rustifieds) = matches.get_many::<String>("rustified-enum") {
for regex in rustifieds {
builder = builder.rustified_enum(regex);
}
}
- if let Some(const_enums) = matches.values_of("constified-enum") {
+ if let Some(const_enums) = matches.get_many::<String>("constified-enum") {
for regex in const_enums {
builder = builder.constified_enum(regex);
}
}
- if let Some(constified_mods) = matches.values_of("constified-enum-module") {
+ if let Some(constified_mods) =
+ matches.get_many::<String>("constified-enum-module")
+ {
for regex in constified_mods {
builder = builder.constified_enum_module(regex);
}
}
- if let Some(variant) = matches.value_of("default-macro-constant-type") {
+ if let Some(variant) =
+ matches.get_one::<String>("default-macro-constant-type")
+ {
builder = builder
.default_macro_constant_type(MacroTypeVariation::from_str(variant)?)
}
- if let Some(variant) = matches.value_of("default-alias-style") {
+ if let Some(variant) = matches.get_one::<String>("default-alias-style") {
builder =
builder.default_alias_style(AliasVariation::from_str(variant)?);
}
- if let Some(type_alias) = matches.values_of("normal-alias") {
+ if let Some(type_alias) = matches.get_many::<String>("normal-alias") {
for regex in type_alias {
builder = builder.type_alias(regex);
}
}
- if let Some(new_type) = matches.values_of("new-type-alias") {
+ if let Some(new_type) = matches.get_many::<String>("new-type-alias") {
for regex in new_type {
builder = builder.new_type_alias(regex);
}
}
- if let Some(new_type_deref) = matches.values_of("new-type-alias-deref") {
+ if let Some(new_type_deref) =
+ matches.get_many::<String>("new-type-alias-deref")
+ {
for regex in new_type_deref {
builder = builder.new_type_alias_deref(regex);
}
}
- if let Some(variant) = matches.value_of("default-non-copy-union-style") {
+ if let Some(variant) =
+ matches.get_one::<String>("default-non-copy-union-style")
+ {
builder = builder.default_non_copy_union_style(
NonCopyUnionStyle::from_str(variant)?,
);
}
if let Some(bindgen_wrapper_union) =
- matches.values_of("bindgen-wrapper-union")
+ matches.get_many::<String>("bindgen-wrapper-union")
{
for regex in bindgen_wrapper_union {
builder = builder.bindgen_wrapper_union(regex);
}
}
- if let Some(manually_drop_union) = matches.values_of("manually-drop-union")
+ if let Some(manually_drop_union) =
+ matches.get_many::<String>("manually-drop-union")
{
for regex in manually_drop_union {
builder = builder.manually_drop_union(regex);
}
}
- if let Some(hidden_types) = matches.values_of("blocklist-type") {
+ if let Some(hidden_types) = matches.get_many::<String>("blocklist-type") {
for ty in hidden_types {
builder = builder.blocklist_type(ty);
}
}
- if let Some(hidden_functions) = matches.values_of("blocklist-function") {
+ if let Some(hidden_functions) =
+ matches.get_many::<String>("blocklist-function")
+ {
for fun in hidden_functions {
builder = builder.blocklist_function(fun);
}
}
- if let Some(hidden_identifiers) = matches.values_of("blocklist-item") {
+ if let Some(hidden_identifiers) =
+ matches.get_many::<String>("blocklist-item")
+ {
for id in hidden_identifiers {
builder = builder.blocklist_item(id);
}
}
- if let Some(hidden_files) = matches.values_of("blocklist-file") {
+ if let Some(hidden_files) = matches.get_many::<String>("blocklist-file") {
for file in hidden_files {
builder = builder.blocklist_file(file);
}
}
- if matches.is_present("builtins") {
+ if matches.get_flag("builtins") {
builder = builder.emit_builtins();
}
- if matches.is_present("no-layout-tests") {
+ if matches.get_flag("no-layout-tests") {
builder = builder.layout_tests(false);
}
- if matches.is_present("no-derive-copy") {
+ if matches.get_flag("no-derive-copy") {
builder = builder.derive_copy(false);
}
- if matches.is_present("no-derive-debug") {
+ if matches.get_flag("no-derive-debug") {
builder = builder.derive_debug(false);
}
- if matches.is_present("impl-debug") {
+ if matches.get_flag("impl-debug") {
builder = builder.impl_debug(true);
}
- if matches.is_present("impl-partialeq") {
+ if matches.get_flag("impl-partialeq") {
builder = builder.impl_partialeq(true);
}
- if matches.is_present("with-derive-default") {
+ if matches.get_flag("with-derive-default") {
builder = builder.derive_default(true);
}
- if matches.is_present("with-derive-hash") {
+ if matches.get_flag("with-derive-hash") {
builder = builder.derive_hash(true);
}
- if matches.is_present("with-derive-partialeq") {
+ if matches.get_flag("with-derive-partialeq") {
builder = builder.derive_partialeq(true);
}
- if matches.is_present("with-derive-partialord") {
+ if matches.get_flag("with-derive-partialord") {
builder = builder.derive_partialord(true);
}
- if matches.is_present("with-derive-eq") {
+ if matches.get_flag("with-derive-eq") {
builder = builder.derive_eq(true);
}
- if matches.is_present("with-derive-ord") {
+ if matches.get_flag("with-derive-ord") {
builder = builder.derive_ord(true);
}
- if matches.is_present("no-derive-default") {
+ if matches.get_flag("no-derive-default") {
builder = builder.derive_default(false);
}
- if matches.is_present("no-prepend-enum-name") {
+ if matches.get_flag("no-prepend-enum-name") {
builder = builder.prepend_enum_name(false);
}
- if matches.is_present("no-include-path-detection") {
+ if matches.get_flag("no-include-path-detection") {
builder = builder.detect_include_paths(false);
}
- if matches.is_present("fit-macro-constant-types") {
+ if matches.get_flag("fit-macro-constant-types") {
builder = builder.fit_macro_constants(true);
}
- if matches.is_present("time-phases") {
+ if matches.get_flag("time-phases") {
builder = builder.time_phases(true);
}
- if matches.is_present("use-array-pointers-in-arguments") {
+ if matches.get_flag("use-array-pointers-in-arguments") {
builder = builder.array_pointers_in_arguments(true);
}
- if let Some(wasm_import_name) = matches.value_of("wasm-import-module-name")
+ if let Some(wasm_import_name) =
+ matches.get_one::<String>("wasm-import-module-name")
{
builder = builder.wasm_import_module_name(wasm_import_name);
}
- if let Some(prefix) = matches.value_of("ctypes-prefix") {
+ if let Some(prefix) = matches.get_one::<String>("ctypes-prefix") {
builder = builder.ctypes_prefix(prefix);
}
- if let Some(prefix) = matches.value_of("anon-fields-prefix") {
+ if let Some(prefix) = matches.get_one::<String>("anon-fields-prefix") {
builder = builder.anon_fields_prefix(prefix);
}
- if let Some(what_to_generate) = matches.value_of("generate") {
+ if let Some(what_to_generate) = matches.get_one::<String>("generate") {
let mut config = CodegenConfig::empty();
for what in what_to_generate.split(',') {
match what {
@@ -814,170 +880,172 @@ where
builder = builder.with_codegen_config(config);
}
- if matches.is_present("emit-clang-ast") {
+ if matches.get_flag("emit-clang-ast") {
builder = builder.emit_clang_ast();
}
- if matches.is_present("emit-ir") {
+ if matches.get_flag("emit-ir") {
builder = builder.emit_ir();
}
- if let Some(path) = matches.value_of("emit-ir-graphviz") {
+ if let Some(path) = matches.get_one::<String>("emit-ir-graphviz") {
builder = builder.emit_ir_graphviz(path);
}
- if matches.is_present("enable-cxx-namespaces") {
+ if matches.get_flag("enable-cxx-namespaces") {
builder = builder.enable_cxx_namespaces();
}
- if matches.is_present("enable-function-attribute-detection") {
+ if matches.get_flag("enable-function-attribute-detection") {
builder = builder.enable_function_attribute_detection();
}
- if matches.is_present("disable-name-namespacing") {
+ if matches.get_flag("disable-name-namespacing") {
builder = builder.disable_name_namespacing();
}
- if matches.is_present("disable-nested-struct-naming") {
+ if matches.get_flag("disable-nested-struct-naming") {
builder = builder.disable_nested_struct_naming();
}
- if matches.is_present("disable-untagged-union") {
+ if matches.get_flag("disable-untagged-union") {
builder = builder.disable_untagged_union();
}
- if matches.is_present("disable-header-comment") {
+ if matches.get_flag("disable-header-comment") {
builder = builder.disable_header_comment();
}
- if matches.is_present("ignore-functions") {
+ if matches.get_flag("ignore-functions") {
builder = builder.ignore_functions();
}
- if matches.is_present("ignore-methods") {
+ if matches.get_flag("ignore-methods") {
builder = builder.ignore_methods();
}
- if matches.is_present("no-convert-floats") {
+ if matches.get_flag("no-convert-floats") {
builder = builder.no_convert_floats();
}
- if matches.is_present("no-doc-comments") {
+ if matches.get_flag("no-doc-comments") {
builder = builder.generate_comments(false);
}
- if matches.is_present("no-recursive-allowlist") {
+ if matches.get_flag("no-recursive-allowlist") {
builder = builder.allowlist_recursively(false);
}
- if matches.is_present("objc-extern-crate") {
+ if matches.get_flag("objc-extern-crate") {
builder = builder.objc_extern_crate(true);
}
- if matches.is_present("generate-block") {
+ if matches.get_flag("generate-block") {
builder = builder.generate_block(true);
}
- if matches.is_present("block-extern-crate") {
+ if matches.get_flag("block-extern-crate") {
builder = builder.block_extern_crate(true);
}
- if let Some(opaque_types) = matches.values_of("opaque-type") {
+ if let Some(opaque_types) = matches.get_many::<String>("opaque-type") {
for ty in opaque_types {
builder = builder.opaque_type(ty);
}
}
- if let Some(lines) = matches.values_of("raw-line") {
+ if let Some(lines) = matches.get_many::<String>("raw-line") {
for line in lines {
builder = builder.raw_line(line);
}
}
- if let Some(mut values) = matches.values_of("module-raw-line") {
+ if let Some(mut values) = matches.get_many::<String>("module-raw-line") {
while let Some(module) = values.next() {
let line = values.next().unwrap();
builder = builder.module_raw_line(module, line);
}
}
- if matches.is_present("use-core") {
+ if matches.get_flag("use-core") {
builder = builder.use_core();
}
- if matches.is_present("distrust-clang-mangling") {
+ if matches.get_flag("distrust-clang-mangling") {
builder = builder.trust_clang_mangling(false);
}
- if matches.is_present("conservative-inline-namespaces") {
+ if matches.get_flag("conservative-inline-namespaces") {
builder = builder.conservative_inline_namespaces();
}
- if matches.is_present("generate-inline-functions") {
+ if matches.get_flag("generate-inline-functions") {
builder = builder.generate_inline_functions(true);
}
- if let Some(allowlist) = matches.values_of("allowlist-function") {
+ if let Some(allowlist) = matches.get_many::<String>("allowlist-function") {
for regex in allowlist {
builder = builder.allowlist_function(regex);
}
}
- if let Some(allowlist) = matches.values_of("allowlist-type") {
+ if let Some(allowlist) = matches.get_many::<String>("allowlist-type") {
for regex in allowlist {
builder = builder.allowlist_type(regex);
}
}
- if let Some(allowlist) = matches.values_of("allowlist-var") {
+ if let Some(allowlist) = matches.get_many::<String>("allowlist-var") {
for regex in allowlist {
builder = builder.allowlist_var(regex);
}
}
- if let Some(hidden_files) = matches.values_of("allowlist-file") {
+ if let Some(hidden_files) = matches.get_many::<String>("allowlist-file") {
for file in hidden_files {
builder = builder.allowlist_file(file);
}
}
- if let Some(args) = matches.values_of("clang-args") {
+ if let Some(args) = matches.get_many::<String>("clang-args") {
for arg in args {
builder = builder.clang_arg(arg);
}
}
- let output = if let Some(path) = matches.value_of("output") {
+ let output = if let Some(path) = matches.get_one::<String>("output") {
let file = File::create(path)?;
- if let Some(depfile) = matches.value_of("depfile") {
+ if let Some(depfile) = matches.get_one::<String>("depfile") {
builder = builder.depfile(path, depfile);
}
Box::new(io::BufWriter::new(file)) as Box<dyn io::Write>
} else {
- if let Some(depfile) = matches.value_of("depfile") {
+ if let Some(depfile) = matches.get_one::<String>("depfile") {
builder = builder.depfile("-", depfile);
}
Box::new(io::BufWriter::new(io::stdout())) as Box<dyn io::Write>
};
- if matches.is_present("dump-preprocessed-input") {
+ if matches.get_flag("dump-preprocessed-input") {
builder.dump_preprocessed_input()?;
}
- if matches.is_present("no-record-matches") {
+ if matches.get_flag("no-record-matches") {
builder = builder.record_matches(false);
}
- if matches.is_present("no-size_t-is-usize") {
+ if matches.get_flag("no-size_t-is-usize") {
builder = builder.size_t_is_usize(false);
}
- let no_rustfmt_bindings = matches.is_present("no-rustfmt-bindings");
+ let no_rustfmt_bindings = matches.get_flag("no-rustfmt-bindings");
if no_rustfmt_bindings {
builder = builder.rustfmt_bindings(false);
}
- if let Some(path_str) = matches.value_of("rustfmt-configuration-file") {
+ if let Some(path_str) =
+ matches.get_one::<String>("rustfmt-configuration-file")
+ {
let path = PathBuf::from(path_str);
if no_rustfmt_bindings {
@@ -1004,79 +1072,81 @@ where
builder = builder.rustfmt_configuration_file(Some(path));
}
- if let Some(no_partialeq) = matches.values_of("no-partialeq") {
+ if let Some(no_partialeq) = matches.get_many::<String>("no-partialeq") {
for regex in no_partialeq {
builder = builder.no_partialeq(regex);
}
}
- if let Some(no_copy) = matches.values_of("no-copy") {
+ if let Some(no_copy) = matches.get_many::<String>("no-copy") {
for regex in no_copy {
builder = builder.no_copy(regex);
}
}
- if let Some(no_debug) = matches.values_of("no-debug") {
+ if let Some(no_debug) = matches.get_many::<String>("no-debug") {
for regex in no_debug {
builder = builder.no_debug(regex);
}
}
- if let Some(no_default) = matches.values_of("no-default") {
+ if let Some(no_default) = matches.get_many::<String>("no-default") {
for regex in no_default {
builder = builder.no_default(regex);
}
}
- if let Some(no_hash) = matches.values_of("no-hash") {
+ if let Some(no_hash) = matches.get_many::<String>("no-hash") {
for regex in no_hash {
builder = builder.no_hash(regex);
}
}
- if let Some(must_use_type) = matches.values_of("must-use-type") {
+ if let Some(must_use_type) = matches.get_many::<String>("must-use-type") {
for regex in must_use_type {
builder = builder.must_use_type(regex);
}
}
- if let Some(dynamic_library_name) = matches.value_of("dynamic-loading") {
+ if let Some(dynamic_library_name) =
+ matches.get_one::<String>("dynamic-loading")
+ {
builder = builder.dynamic_library_name(dynamic_library_name);
}
- if matches.is_present("dynamic-link-require-all") {
+ if matches.get_flag("dynamic-link-require-all") {
builder = builder.dynamic_link_require_all(true);
}
- if matches.is_present("respect-cxx-access-specs") {
+ if matches.get_flag("respect-cxx-access-specs") {
builder = builder.respect_cxx_access_specs(true);
}
- if matches.is_present("translate-enum-integer-types") {
+ if matches.get_flag("translate-enum-integer-types") {
builder = builder.translate_enum_integer_types(true);
}
- if matches.is_present("c-naming") {
+ if matches.get_flag("c-naming") {
builder = builder.c_naming(true);
}
- if matches.is_present("explicit-padding") {
+ if matches.get_flag("explicit-padding") {
builder = builder.explicit_padding(true);
}
- if matches.is_present("vtable-generation") {
+ if matches.get_flag("vtable-generation") {
builder = builder.vtable_generation(true);
}
- if matches.is_present("sort-semantically") {
+ if matches.get_flag("sort-semantically") {
builder = builder.sort_semantically(true);
}
- if matches.is_present("merge-extern-blocks") {
+ if matches.get_flag("merge-extern-blocks") {
builder = builder.merge_extern_blocks(true);
}
- if let Some(abi_overrides) = matches.values_of("override-abi") {
+ if let Some(abi_overrides) = matches.get_many::<String>("override-abi") {
for abi_override in abi_overrides {
let (regex, abi_str) = abi_override
.rsplit_once('=')
@@ -1088,7 +1158,7 @@ where
}
}
- if matches.is_present("wrap-unsafe-ops") {
+ if matches.get_flag("wrap-unsafe-ops") {
builder = builder.wrap_unsafe_ops(true);
}