Skip to content

Commit 70b9d7a

Browse files
committed
tests: Run rustfmt.
1 parent 87afbf9 commit 70b9d7a

1 file changed

Lines changed: 20 additions & 14 deletions

File tree

tests/tests.rs

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
extern crate cbindgen;
22

33
use cbindgen::*;
4-
use tempfile::NamedTempFile;
54
use std::collections::HashSet;
65
use std::fs::File;
76
use std::io::Read;
87
use std::path::Path;
98
use std::process::Command;
109
use std::{env, fs, str};
10+
use tempfile::NamedTempFile;
1111

1212
use pretty_assertions::assert_eq;
1313

@@ -47,15 +47,15 @@ fn run_cbindgen(
4747
if let Some(output) = output {
4848
command.arg("--output").arg(output);
4949
}
50-
50+
5151
let depfile = if generate_depfile {
5252
let tmp = tempfile::NamedTempFile::new().unwrap();
5353
command.arg("--depfile").arg(tmp.path());
5454
Some(tmp)
5555
} else {
5656
None
5757
};
58-
58+
5959
let symfile = if generate_symfile {
6060
let tmp = tempfile::NamedTempFile::new().unwrap();
6161
command.arg("--symfile").arg(tmp.path());
@@ -224,15 +224,15 @@ fn run_compile_test(
224224
style: Option<Style>,
225225
cbindgen_outputs: &mut HashSet<Vec<u8>>,
226226
package_version: bool,
227-
generate_symfile: bool
227+
generate_symfile: bool,
228228
) {
229229
let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
230230
let tests_path = Path::new(&crate_dir).join("tests");
231231
let mut generated_file = tests_path.join("expectations");
232232
let mut generated_symfile = tests_path.join("expectations-symbols");
233233
fs::create_dir_all(&generated_file).unwrap();
234234
fs::create_dir_all(&generated_symfile).unwrap();
235-
235+
236236
let verify = env::var_os("CBINDGEN_TEST_VERIFY").is_some();
237237
let no_compile = env::var_os("CBINDGEN_TEST_NO_COMPILE").is_some();
238238

@@ -273,15 +273,19 @@ fn run_compile_test(
273273
)
274274
};
275275

276-
let CBindgenOutput { bindings_content, depfile_content, symfile_content } = run_cbindgen(
276+
let CBindgenOutput {
277+
bindings_content,
278+
depfile_content,
279+
symfile_content,
280+
} = run_cbindgen(
277281
path,
278282
output_file,
279283
language,
280284
cpp_compat,
281285
style,
282286
generate_depfile,
283287
package_version,
284-
true
288+
true,
285289
);
286290
if generate_depfile {
287291
let depfile = depfile_content.expect("No depfile generated");
@@ -312,18 +316,20 @@ fn run_compile_test(
312316
// Compare cbindgen output to expected (existing on disk) output.
313317
let prev_cbindgen_bindings = fs::read(&generated_file).unwrap();
314318
assert_eq!(bindings_content, prev_cbindgen_bindings);
315-
319+
316320
if generate_symfile {
317321
let symbols = symfile_content.expect("No symfile generated");
318322
let prev_cbindgen_symbols = fs::read(&generated_symfile).unwrap();
319323
let prev_symbols = String::from_utf8(prev_cbindgen_symbols).unwrap();
320324
assert_eq!(symbols, prev_symbols);
321325
}
322326
} else {
323-
fs::write(&generated_file, &bindings_content).expect("Failed to write generated bindings.");
327+
fs::write(&generated_file, &bindings_content)
328+
.expect("Failed to write generated bindings.");
324329
if generate_symfile {
325330
let symbols = symfile_content.expect("No symfile generated");
326-
fs::write(&generated_symfile, &symbols).expect("Failed to write generated symbols.");
331+
fs::write(&generated_symfile, &symbols)
332+
.expect("Failed to write generated symbols.");
327333
}
328334
}
329335

@@ -367,8 +373,8 @@ fn test_file(name: &'static str, filename: &'static str) {
367373
let mut cbindgen_outputs = HashSet::new();
368374
for cpp_compat in &[true, false] {
369375
for style in &[Style::Type, Style::Tag, Style::Both] {
370-
// We only need to generate the symfile once,
371-
// it should not change with the different options.
376+
// We only need to generate the symfile once,
377+
// it should not change with the different options.
372378
let generate_symfile = !cpp_compat && *style == Style::Type;
373379
run_compile_test(
374380
name,
@@ -393,7 +399,7 @@ fn test_file(name: &'static str, filename: &'static str) {
393399
None,
394400
&mut HashSet::new(),
395401
false,
396-
/* generate_symfile = */ false
402+
/* generate_symfile = */ false,
397403
);
398404

399405
// `Style::Both` should be identical to `Style::Tag` for Cython.
@@ -408,7 +414,7 @@ fn test_file(name: &'static str, filename: &'static str) {
408414
Some(*style),
409415
&mut cbindgen_outputs,
410416
false,
411-
/* generate_symfile = */ false
417+
/* generate_symfile = */ false,
412418
);
413419
}
414420
}

0 commit comments

Comments
 (0)