From cebdedcc40f55d85d1370455c9d596a7c4ac1a19 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Mon, 3 Oct 2022 13:02:03 -0500 Subject: [PATCH] address clippy lints --- src/codegen/mod.rs | 2 +- src/ir/enum_ty.rs | 2 +- src/ir/var.rs | 10 +++------- src/lib.rs | 2 +- src/options.rs | 8 ++++---- tests/tests.rs | 8 ++++---- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index a8a7b07696..7e0d7aa0c9 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -3439,7 +3439,7 @@ impl std::str::FromStr for AliasVariation { } /// Enum for how non-Copy unions should be translated. -#[derive(Copy, Clone, PartialEq, Debug)] +#[derive(Copy, Clone, PartialEq, Eq, Debug)] pub enum NonCopyUnionStyle { /// Wrap members in a type generated by bindgen. BindgenWrapper, diff --git a/src/ir/enum_ty.rs b/src/ir/enum_ty.rs index 2b039a4fac..123d1d793d 100644 --- a/src/ir/enum_ty.rs +++ b/src/ir/enum_ty.rs @@ -165,7 +165,7 @@ impl Enum { return false; } - self.variants().iter().any(|v| enums.matches(&v.name())) + self.variants().iter().any(|v| enums.matches(v.name())) } /// Returns the final representation of the enum. diff --git a/src/ir/var.rs b/src/ir/var.rs index e44d57afe4..eecca4df54 100644 --- a/src/ir/var.rs +++ b/src/ir/var.rs @@ -325,8 +325,7 @@ impl ClangSubItemParser for Var { let mut val = cursor.evaluate().and_then(|v| v.as_int()); if val.is_none() || !kind.signedness_matches(val.unwrap()) { - let tu = ctx.translation_unit(); - val = get_integer_literal_from_cursor(&cursor, tu); + val = get_integer_literal_from_cursor(&cursor); } val.map(|val| { @@ -391,10 +390,7 @@ fn parse_int_literal_tokens(cursor: &clang::Cursor) -> Option { } } -fn get_integer_literal_from_cursor( - cursor: &clang::Cursor, - unit: &clang::TranslationUnit, -) -> Option { +fn get_integer_literal_from_cursor(cursor: &clang::Cursor) -> Option { use clang_sys::*; let mut value = None; cursor.visit(|c| { @@ -403,7 +399,7 @@ fn get_integer_literal_from_cursor( value = parse_int_literal_tokens(&c); } CXCursor_UnexposedExpr => { - value = get_integer_literal_from_cursor(&c, unit); + value = get_integer_literal_from_cursor(&c); } _ => (), } diff --git a/src/lib.rs b/src/lib.rs index b2467fbcad..6e6fa225d6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2647,7 +2647,7 @@ impl Bindings { .as_ref() .and_then(|f| f.to_str()) { - cmd.args(&["--config-path", path]); + cmd.args(["--config-path", path]); } let mut child = cmd.spawn()?; diff --git a/src/options.rs b/src/options.rs index 29edb78b1c..1025a36dc9 100644 --- a/src/options.rs +++ b/src/options.rs @@ -39,7 +39,7 @@ where .help("The default style of code used to generate enums.") .value_name("variant") .default_value("consts") - .possible_values(&[ + .possible_values([ "consts", "moduleconsts", "bitfield", @@ -98,14 +98,14 @@ where .help("The default signed/unsigned type for C macro constants.") .value_name("variant") .default_value("unsigned") - .possible_values(&["signed", "unsigned"]) + .possible_values(["signed", "unsigned"]) .multiple_occurrences(false), 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(&[ + .possible_values([ "type_alias", "new_type", "new_type_deref", @@ -147,7 +147,7 @@ where ) .value_name("style") .default_value("bindgen_wrapper") - .possible_values(&[ + .possible_values([ "bindgen_wrapper", "manually_drop", ]) diff --git a/tests/tests.rs b/tests/tests.rs index 8dcc54370b..ac53d73965 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -31,7 +31,7 @@ fn rustfmt(source: String) -> (String, String) { let mut rustfmt = { let mut p = process::Command::new("rustup"); - p.args(&["run", "nightly", "rustfmt", "--version"]); + p.args(["run", "nightly", "rustfmt", "--version"]); p }; @@ -59,13 +59,13 @@ The latest `rustfmt` is required to run the `bindgen` test suite. Install Some(r) => process::Command::new(r), None => { let mut p = process::Command::new("rustup"); - p.args(&["run", "nightly", "rustfmt"]); + p.args(["run", "nightly", "rustfmt"]); p } }; let mut child = child - .args(&[ + .args([ "--config-path", concat!(env!("CARGO_MANIFEST_DIR"), "/tests/rustfmt.toml"), ]) @@ -164,7 +164,7 @@ fn error_diff_mismatch( let mut actual_result_file = fs::File::create(&actual_result_path)?; actual_result_file.write_all(actual.as_bytes())?; std::process::Command::new(var) - .args(&[filename, &actual_result_path]) + .args([filename, &actual_result_path]) .output()?; }