Skip to content

Commit 43741d2

Browse files
authored
please clippy (#2573)
1 parent 5e95130 commit 43741d2

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

bindgen-tests/tests/tests.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ fn create_bindgen_builder(header: &Path) -> Result<BuilderState, Error> {
254254
.last()
255255
.and_then(shlex::split)
256256
.unwrap();
257-
flags.extend(extra_flags.into_iter());
257+
flags.extend(extra_flags);
258258
} else if line.contains("bindgen-osx-only") {
259259
let prepend_flags = ["--raw-line", "#![cfg(target_os=\"macos\")]"];
260260
flags = prepend_flags
@@ -304,10 +304,7 @@ fn create_bindgen_builder(header: &Path) -> Result<BuilderState, Error> {
304304
"",
305305
];
306306

307-
let args = prepend
308-
.iter()
309-
.map(ToString::to_string)
310-
.chain(flags.into_iter());
307+
let args = prepend.iter().map(ToString::to_string).chain(flags);
311308

312309
let mut builder = builder_from_flags(args)?.0;
313310
if let Some(ref parse_cb) = parse_callbacks {

bindgen/codegen/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4912,7 +4912,7 @@ pub(crate) mod utils {
49124912

49134913
let items = vec![use_objc, id_type];
49144914
let old_items = mem::replace(result, items);
4915-
result.extend(old_items.into_iter());
4915+
result.extend(old_items);
49164916
}
49174917

49184918
pub(crate) fn prepend_block_header(
@@ -4931,7 +4931,7 @@ pub(crate) mod utils {
49314931

49324932
let items = vec![use_block];
49334933
let old_items = mem::replace(result, items);
4934-
result.extend(old_items.into_iter());
4934+
result.extend(old_items);
49354935
}
49364936

49374937
pub(crate) fn prepend_union_types(
@@ -5043,7 +5043,7 @@ pub(crate) mod utils {
50435043
];
50445044

50455045
let old_items = mem::replace(result, items);
5046-
result.extend(old_items.into_iter());
5046+
result.extend(old_items);
50475047
}
50485048

50495049
pub(crate) fn prepend_incomplete_array_types(
@@ -5119,7 +5119,7 @@ pub(crate) mod utils {
51195119
];
51205120

51215121
let old_items = mem::replace(result, items);
5122-
result.extend(old_items.into_iter());
5122+
result.extend(old_items);
51235123
}
51245124

51255125
pub(crate) fn prepend_complex_type(
@@ -5136,7 +5136,7 @@ pub(crate) mod utils {
51365136

51375137
let items = vec![complex_type];
51385138
let old_items = mem::replace(result, items);
5139-
result.extend(old_items.into_iter());
5139+
result.extend(old_items);
51405140
}
51415141

51425142
pub(crate) fn build_path(

bindgen/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -912,10 +912,10 @@ impl Bindings {
912912
/// Write these bindings as source text to the given `Write`able.
913913
pub fn write<'a>(&self, mut writer: Box<dyn Write + 'a>) -> io::Result<()> {
914914
if !self.options.disable_header_comment {
915-
let version = option_env!("CARGO_PKG_VERSION");
915+
let version =
916+
option_env!("CARGO_PKG_VERSION").unwrap_or("(unknown version)");
916917
let header = format!(
917-
"/* automatically generated by rust-bindgen {} */\n\n",
918-
version.unwrap_or("(unknown version)")
918+
"/* automatically generated by rust-bindgen {version} */\n\n",
919919
);
920920
writer.write_all(header.as_bytes())?;
921921
}
@@ -1244,7 +1244,7 @@ fn commandline_flag_unit_test_function() {
12441244
let bindings = crate::builder();
12451245
let command_line_flags = bindings.command_line_flags();
12461246

1247-
let test_cases = vec![
1247+
let test_cases = [
12481248
"--rust-target",
12491249
"--no-derive-default",
12501250
"--generate",
@@ -1263,7 +1263,7 @@ fn commandline_flag_unit_test_function() {
12631263
.allowlist_function("safe_function");
12641264

12651265
let command_line_flags = bindings.command_line_flags();
1266-
let test_cases = vec![
1266+
let test_cases = [
12671267
"--rust-target",
12681268
"input_header",
12691269
"--no-derive-default",

0 commit comments

Comments
 (0)