Skip to content

Commit 01c4539

Browse files
authored
Remove deprecated flags (#2408)
1 parent a252766 commit 01c4539

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@
166166
## Changed
167167

168168
## Removed
169+
* The following deprecated flags were removed: `--use-msvc-mangling`,
170+
`--rustfmt-bindings` and `--size_t-is-usize`.
169171

170172
## Fixed
171173

bindgen-cli/options.rs

+1-20
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,6 @@ struct BindgenCommand {
239239
/// Conservatively generate inline namespaces to avoid name conflicts.
240240
#[arg(long)]
241241
conservative_inline_namespaces: bool,
242-
/// MSVC C++ ABI mangling. DEPRECATED: Has no effect.
243-
#[arg(long)]
244-
use_msvc_mangling: bool,
245242
/// Allowlist all the free-standing functions matching <REGEX>. Other non-allowlisted functions will not be generated.
246243
#[arg(long, value_name = "REGEX")]
247244
allowlist_function: Vec<String>,
@@ -266,20 +263,14 @@ struct BindgenCommand {
266263
/// Do not record matching items in the regex sets. This disables reporting of unused items.
267264
#[arg(long)]
268265
no_record_matches: bool,
269-
/// Ignored - this is enabled by default.
270-
#[arg(long = "size_t-is-usize")]
271-
size_t_is_usize: bool,
272266
/// Do not bind size_t as usize (useful on platforms where those types are incompatible).
273267
#[arg(long = "no-size_t-is-usize")]
274268
no_size_t_is_usize: bool,
275269
/// Do not format the generated bindings with rustfmt.
276270
#[arg(long)]
277271
no_rustfmt_bindings: bool,
278-
/// Format the generated bindings with rustfmt. DEPRECATED: --rustfmt-bindings is now enabled by default. Disable with --no-rustfmt-bindings.
279-
#[arg(long)]
280-
rustfmt_bindings: bool,
281272
/// 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.
282-
#[arg(long, value_name = "PATH")]
273+
#[arg(long, value_name = "PATH", conflicts_with("no_rustfmt_bindings"))]
283274
rustfmt_configuration_file: Option<String>,
284275
/// Avoid deriving PartialEq for types matching <REGEX>.
285276
#[arg(long, value_name = "REGEX")]
@@ -449,7 +440,6 @@ where
449440
rust_target,
450441
use_core,
451442
conservative_inline_namespaces,
452-
use_msvc_mangling: _,
453443
allowlist_function,
454444
generate_inline_functions,
455445
allowlist_type,
@@ -458,10 +448,8 @@ where
458448
verbose,
459449
dump_preprocessed_input,
460450
no_record_matches,
461-
size_t_is_usize: _,
462451
no_size_t_is_usize,
463452
no_rustfmt_bindings,
464-
rustfmt_bindings: _,
465453
rustfmt_configuration_file,
466454
no_partialeq,
467455
no_copy,
@@ -831,13 +819,6 @@ where
831819
if let Some(path_str) = rustfmt_configuration_file {
832820
let path = PathBuf::from(path_str);
833821

834-
if no_rustfmt_bindings {
835-
return Err(Error::new(
836-
ErrorKind::Other,
837-
"Cannot supply both --rustfmt-configuration-file and --no-rustfmt-bindings",
838-
));
839-
}
840-
841822
if !path.is_absolute() {
842823
return Err(Error::new(
843824
ErrorKind::Other,

0 commit comments

Comments
 (0)