Skip to content

Commit 95c4017

Browse files
emilioemilio
committed
tests: Reformat test crate.
Now that the rustfmt configuration is different we need to do this to not generate unexpected failures.
1 parent 5aec0a9 commit 95c4017

File tree

386 files changed

+5490
-2180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

386 files changed

+5490
-2180
lines changed

‎tests/expectations/build.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ use std::fs;
88
use std::io::Write;
99
use std::path::Path;
1010

11-
const LIBCLANG_VERSION_DIRS: &'static [&'static str] =
12-
&["libclang-3.8", "libclang-3.9", "libclang-4", "libclang-5", "libclang-9"];
11+
const LIBCLANG_VERSION_DIRS: &'static [&'static str] = &[
12+
"libclang-3.8",
13+
"libclang-3.9",
14+
"libclang-4",
15+
"libclang-5",
16+
"libclang-9",
17+
];
1318

1419
fn main() {
1520
println!("cargo:rerun-if-changed=build.rs");
@@ -27,13 +32,16 @@ fn main() {
2732
let entry = entry.unwrap();
2833
let path = entry.path();
2934
let path = path.canonicalize().unwrap_or_else(|_| path.into());
30-
if path.extension().map(|e| e.to_string_lossy()) != Some("rs".into()) {
35+
if path.extension().map(|e| e.to_string_lossy()) !=
36+
Some("rs".into())
37+
{
3138
continue;
3239
}
3340

3441
println!("cargo:rerun-if-changed={}", path.display());
3542

36-
let module_name: String = path.display()
43+
let module_name: String = path
44+
.display()
3745
.to_string()
3846
.chars()
3947
.map(|c| match c {

‎tests/expectations/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎tests/expectations/tests/16-byte-alignment.rs

+38-16
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
4747
);
4848
assert_eq!(
4949
unsafe {
50-
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>())).dport as *const _
51-
as usize
50+
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>(
51+
)))
52+
.dport as *const _ as usize
5253
},
5354
0usize,
5455
concat!(
@@ -60,8 +61,9 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
6061
);
6162
assert_eq!(
6263
unsafe {
63-
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>())).sport as *const _
64-
as usize
64+
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>(
65+
)))
66+
.sport as *const _ as usize
6567
},
6668
2usize,
6769
concat!(
@@ -86,7 +88,8 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1() {
8688
);
8789
assert_eq!(
8890
unsafe {
89-
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1>())).sctp_tag as *const _ as usize
91+
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1>())).sctp_tag
92+
as *const _ as usize
9093
},
9194
0usize,
9295
concat!(
@@ -115,7 +118,10 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
115118
concat!("Alignment of ", stringify!(rte_ipv4_tuple))
116119
);
117120
assert_eq!(
118-
unsafe { &(*(::std::ptr::null::<rte_ipv4_tuple>())).src_addr as *const _ as usize },
121+
unsafe {
122+
&(*(::std::ptr::null::<rte_ipv4_tuple>())).src_addr as *const _
123+
as usize
124+
},
119125
0usize,
120126
concat!(
121127
"Offset of field: ",
@@ -125,7 +131,10 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
125131
)
126132
);
127133
assert_eq!(
128-
unsafe { &(*(::std::ptr::null::<rte_ipv4_tuple>())).dst_addr as *const _ as usize },
134+
unsafe {
135+
&(*(::std::ptr::null::<rte_ipv4_tuple>())).dst_addr as *const _
136+
as usize
137+
},
129138
4usize,
130139
concat!(
131140
"Offset of field: ",
@@ -180,8 +189,9 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
180189
);
181190
assert_eq!(
182191
unsafe {
183-
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>())).dport as *const _
184-
as usize
192+
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>(
193+
)))
194+
.dport as *const _ as usize
185195
},
186196
0usize,
187197
concat!(
@@ -193,8 +203,9 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
193203
);
194204
assert_eq!(
195205
unsafe {
196-
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>())).sport as *const _
197-
as usize
206+
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>(
207+
)))
208+
.sport as *const _ as usize
198209
},
199210
2usize,
200211
concat!(
@@ -219,7 +230,8 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1() {
219230
);
220231
assert_eq!(
221232
unsafe {
222-
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1>())).sctp_tag as *const _ as usize
233+
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1>())).sctp_tag
234+
as *const _ as usize
223235
},
224236
0usize,
225237
concat!(
@@ -248,7 +260,10 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
248260
concat!("Alignment of ", stringify!(rte_ipv6_tuple))
249261
);
250262
assert_eq!(
251-
unsafe { &(*(::std::ptr::null::<rte_ipv6_tuple>())).src_addr as *const _ as usize },
263+
unsafe {
264+
&(*(::std::ptr::null::<rte_ipv6_tuple>())).src_addr as *const _
265+
as usize
266+
},
252267
0usize,
253268
concat!(
254269
"Offset of field: ",
@@ -258,7 +273,10 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
258273
)
259274
);
260275
assert_eq!(
261-
unsafe { &(*(::std::ptr::null::<rte_ipv6_tuple>())).dst_addr as *const _ as usize },
276+
unsafe {
277+
&(*(::std::ptr::null::<rte_ipv6_tuple>())).dst_addr as *const _
278+
as usize
279+
},
262280
16usize,
263281
concat!(
264282
"Offset of field: ",
@@ -294,7 +312,9 @@ fn bindgen_test_layout_rte_thash_tuple() {
294312
concat!("Alignment of ", stringify!(rte_thash_tuple))
295313
);
296314
assert_eq!(
297-
unsafe { &(*(::std::ptr::null::<rte_thash_tuple>())).v4 as *const _ as usize },
315+
unsafe {
316+
&(*(::std::ptr::null::<rte_thash_tuple>())).v4 as *const _ as usize
317+
},
298318
0usize,
299319
concat!(
300320
"Offset of field: ",
@@ -304,7 +324,9 @@ fn bindgen_test_layout_rte_thash_tuple() {
304324
)
305325
);
306326
assert_eq!(
307-
unsafe { &(*(::std::ptr::null::<rte_thash_tuple>())).v6 as *const _ as usize },
327+
unsafe {
328+
&(*(::std::ptr::null::<rte_thash_tuple>())).v6 as *const _ as usize
329+
},
308330
0usize,
309331
concat!(
310332
"Offset of field: ",

‎tests/expectations/tests/16-byte-alignment_1_0.rs

+48-21
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
/* automatically generated by rust-bindgen */
22

3-
4-
#![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
5-
3+
#![allow(
4+
dead_code,
5+
non_snake_case,
6+
non_camel_case_types,
7+
non_upper_case_globals
8+
)]
69

710
#[repr(C)]
811
pub struct __BindgenUnionField<T>(::std::marker::PhantomData<T>);
@@ -57,7 +60,8 @@ pub struct rte_ipv4_tuple {
5760
#[repr(C)]
5861
#[derive(Debug, Default, Copy, Hash, PartialEq, Eq)]
5962
pub struct rte_ipv4_tuple__bindgen_ty_1 {
60-
pub __bindgen_anon_1: __BindgenUnionField<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>,
63+
pub __bindgen_anon_1:
64+
__BindgenUnionField<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>,
6165
pub sctp_tag: __BindgenUnionField<u32>,
6266
pub bindgen_union_field: u32,
6367
}
@@ -87,8 +91,9 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
8791
);
8892
assert_eq!(
8993
unsafe {
90-
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>())).dport as *const _
91-
as usize
94+
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>(
95+
)))
96+
.dport as *const _ as usize
9297
},
9398
0usize,
9499
concat!(
@@ -100,8 +105,9 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1() {
100105
);
101106
assert_eq!(
102107
unsafe {
103-
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>())).sport as *const _
104-
as usize
108+
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1__bindgen_ty_1>(
109+
)))
110+
.sport as *const _ as usize
105111
},
106112
2usize,
107113
concat!(
@@ -131,7 +137,8 @@ fn bindgen_test_layout_rte_ipv4_tuple__bindgen_ty_1() {
131137
);
132138
assert_eq!(
133139
unsafe {
134-
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1>())).sctp_tag as *const _ as usize
140+
&(*(::std::ptr::null::<rte_ipv4_tuple__bindgen_ty_1>())).sctp_tag
141+
as *const _ as usize
135142
},
136143
0usize,
137144
concat!(
@@ -160,7 +167,10 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
160167
concat!("Alignment of ", stringify!(rte_ipv4_tuple))
161168
);
162169
assert_eq!(
163-
unsafe { &(*(::std::ptr::null::<rte_ipv4_tuple>())).src_addr as *const _ as usize },
170+
unsafe {
171+
&(*(::std::ptr::null::<rte_ipv4_tuple>())).src_addr as *const _
172+
as usize
173+
},
164174
0usize,
165175
concat!(
166176
"Offset of field: ",
@@ -170,7 +180,10 @@ fn bindgen_test_layout_rte_ipv4_tuple() {
170180
)
171181
);
172182
assert_eq!(
173-
unsafe { &(*(::std::ptr::null::<rte_ipv4_tuple>())).dst_addr as *const _ as usize },
183+
unsafe {
184+
&(*(::std::ptr::null::<rte_ipv4_tuple>())).dst_addr as *const _
185+
as usize
186+
},
174187
4usize,
175188
concat!(
176189
"Offset of field: ",
@@ -195,7 +208,8 @@ pub struct rte_ipv6_tuple {
195208
#[repr(C)]
196209
#[derive(Debug, Default, Copy, Hash, PartialEq, Eq)]
197210
pub struct rte_ipv6_tuple__bindgen_ty_1 {
198-
pub __bindgen_anon_1: __BindgenUnionField<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>,
211+
pub __bindgen_anon_1:
212+
__BindgenUnionField<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>,
199213
pub sctp_tag: __BindgenUnionField<u32>,
200214
pub bindgen_union_field: u32,
201215
}
@@ -225,8 +239,9 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
225239
);
226240
assert_eq!(
227241
unsafe {
228-
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>())).dport as *const _
229-
as usize
242+
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>(
243+
)))
244+
.dport as *const _ as usize
230245
},
231246
0usize,
232247
concat!(
@@ -238,8 +253,9 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1() {
238253
);
239254
assert_eq!(
240255
unsafe {
241-
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>())).sport as *const _
242-
as usize
256+
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1__bindgen_ty_1>(
257+
)))
258+
.sport as *const _ as usize
243259
},
244260
2usize,
245261
concat!(
@@ -269,7 +285,8 @@ fn bindgen_test_layout_rte_ipv6_tuple__bindgen_ty_1() {
269285
);
270286
assert_eq!(
271287
unsafe {
272-
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1>())).sctp_tag as *const _ as usize
288+
&(*(::std::ptr::null::<rte_ipv6_tuple__bindgen_ty_1>())).sctp_tag
289+
as *const _ as usize
273290
},
274291
0usize,
275292
concat!(
@@ -298,7 +315,10 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
298315
concat!("Alignment of ", stringify!(rte_ipv6_tuple))
299316
);
300317
assert_eq!(
301-
unsafe { &(*(::std::ptr::null::<rte_ipv6_tuple>())).src_addr as *const _ as usize },
318+
unsafe {
319+
&(*(::std::ptr::null::<rte_ipv6_tuple>())).src_addr as *const _
320+
as usize
321+
},
302322
0usize,
303323
concat!(
304324
"Offset of field: ",
@@ -308,7 +328,10 @@ fn bindgen_test_layout_rte_ipv6_tuple() {
308328
)
309329
);
310330
assert_eq!(
311-
unsafe { &(*(::std::ptr::null::<rte_ipv6_tuple>())).dst_addr as *const _ as usize },
331+
unsafe {
332+
&(*(::std::ptr::null::<rte_ipv6_tuple>())).dst_addr as *const _
333+
as usize
334+
},
312335
16usize,
313336
concat!(
314337
"Offset of field: ",
@@ -338,7 +361,9 @@ fn bindgen_test_layout_rte_thash_tuple() {
338361
concat!("Size of: ", stringify!(rte_thash_tuple))
339362
);
340363
assert_eq!(
341-
unsafe { &(*(::std::ptr::null::<rte_thash_tuple>())).v4 as *const _ as usize },
364+
unsafe {
365+
&(*(::std::ptr::null::<rte_thash_tuple>())).v4 as *const _ as usize
366+
},
342367
0usize,
343368
concat!(
344369
"Offset of field: ",
@@ -348,7 +373,9 @@ fn bindgen_test_layout_rte_thash_tuple() {
348373
)
349374
);
350375
assert_eq!(
351-
unsafe { &(*(::std::ptr::null::<rte_thash_tuple>())).v6 as *const _ as usize },
376+
unsafe {
377+
&(*(::std::ptr::null::<rte_thash_tuple>())).v6 as *const _ as usize
378+
},
352379
0usize,
353380
concat!(
354381
"Offset of field: ",

‎tests/expectations/tests/381-decltype-alias.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
/* automatically generated by rust-bindgen */
22

3-
4-
#![allow(dead_code, non_snake_case, non_camel_case_types, non_upper_case_globals)]
5-
3+
#![allow(
4+
dead_code,
5+
non_snake_case,
6+
non_camel_case_types,
7+
non_upper_case_globals
8+
)]
69

710
#[repr(C)]
811
#[derive(Debug, Default, Copy, Clone)]

0 commit comments

Comments
 (0)