summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-02-09 16:16:51 +0000
committerGitHub <noreply@github.com>2023-02-09 16:16:51 +0000
commit782e55ae5818c114ede2a579f7653c3bdc0d23e3 (patch)
tree664f3e802fb6c95f61bf65844839bb4e541a2f4e
parentc8cf212219fa988f4fdcd16944fc5117bb957f1b (diff)
parent01c45391284674041f89454bfe6eeb900aa0be28 (diff)
-rw-r--r--CHANGELOG.md2
-rw-r--r--bindgen-cli/options.rs21
2 files changed, 3 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d901bab1..037755ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -166,6 +166,8 @@
## Changed
## Removed
+ * The following deprecated flags were removed: `--use-msvc-mangling`,
+ `--rustfmt-bindings` and `--size_t-is-usize`.
## Fixed
diff --git a/bindgen-cli/options.rs b/bindgen-cli/options.rs
index 458c7bab..966e6aec 100644
--- a/bindgen-cli/options.rs
+++ b/bindgen-cli/options.rs
@@ -239,9 +239,6 @@ struct BindgenCommand {
/// Conservatively generate inline namespaces to avoid name conflicts.
#[arg(long)]
conservative_inline_namespaces: bool,
- /// MSVC C++ ABI mangling. DEPRECATED: Has no effect.
- #[arg(long)]
- use_msvc_mangling: bool,
/// Allowlist all the free-standing functions matching <REGEX>. Other non-allowlisted functions will not be generated.
#[arg(long, value_name = "REGEX")]
allowlist_function: Vec<String>,
@@ -266,20 +263,14 @@ struct BindgenCommand {
/// Do not record matching items in the regex sets. This disables reporting of unused items.
#[arg(long)]
no_record_matches: bool,
- /// Ignored - this is enabled by default.
- #[arg(long = "size_t-is-usize")]
- size_t_is_usize: bool,
/// Do not bind size_t as usize (useful on platforms where those types are incompatible).
#[arg(long = "no-size_t-is-usize")]
no_size_t_is_usize: bool,
/// Do not format the generated bindings with rustfmt.
#[arg(long)]
no_rustfmt_bindings: bool,
- /// Format the generated bindings with rustfmt. DEPRECATED: --rustfmt-bindings is now enabled by default. Disable with --no-rustfmt-bindings.
- #[arg(long)]
- rustfmt_bindings: bool,
/// The absolute path to the rustfmt configuration file. The configuration file will be used for formatting the bindings. This parameter is incompatible with --no-rustfmt-bindings.
- #[arg(long, value_name = "PATH")]
+ #[arg(long, value_name = "PATH", conflicts_with("no_rustfmt_bindings"))]
rustfmt_configuration_file: Option<String>,
/// Avoid deriving PartialEq for types matching <REGEX>.
#[arg(long, value_name = "REGEX")]
@@ -449,7 +440,6 @@ where
rust_target,
use_core,
conservative_inline_namespaces,
- use_msvc_mangling: _,
allowlist_function,
generate_inline_functions,
allowlist_type,
@@ -458,10 +448,8 @@ where
verbose,
dump_preprocessed_input,
no_record_matches,
- size_t_is_usize: _,
no_size_t_is_usize,
no_rustfmt_bindings,
- rustfmt_bindings: _,
rustfmt_configuration_file,
no_partialeq,
no_copy,
@@ -831,13 +819,6 @@ where
if let Some(path_str) = rustfmt_configuration_file {
let path = PathBuf::from(path_str);
- if no_rustfmt_bindings {
- return Err(Error::new(
- ErrorKind::Other,
- "Cannot supply both --rustfmt-configuration-file and --no-rustfmt-bindings",
- ));
- }
-
if !path.is_absolute() {
return Err(Error::new(
ErrorKind::Other,