Skip to content

Commit 332f289

Browse files
borsbors
committed
Auto merge of rust-lang#2246 - dtolnay-contrib:rustfmt1, r=oli-obk
Format tests with rustfmt (51-100 of 300) Extracted from rust-lang#2097. Like rust-lang#2244, this is intended to be "easy" cases which don't involve comments in the vicinity.
2 parents bdf2a8a + 8efc049 commit 332f289

Some content is hidden

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

52 files changed

+547
-380
lines changed

‎tests/pass/align.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
fn manual_alignment() {
33
let x = &mut [0u8; 3];
44
let base_addr = x as *mut _ as usize;
5-
let base_addr_aligned = if base_addr % 2 == 0 { base_addr } else { base_addr+1 };
5+
let base_addr_aligned = if base_addr % 2 == 0 { base_addr } else { base_addr + 1 };
66
let u16_ptr = base_addr_aligned as *mut u16;
7-
unsafe { *u16_ptr = 2; }
7+
unsafe {
8+
*u16_ptr = 2;
9+
}
810
}
911

1012
/// Test standard library `align_to`.
1113
fn align_to() {
1214
const LEN: usize = 128;
1315
let buf = &[0u8; LEN];
1416
let (l, m, r) = unsafe { buf.align_to::<i32>() };
15-
assert!(m.len()*4 >= LEN-4);
17+
assert!(m.len() * 4 >= LEN - 4);
1618
assert!(l.len() + r.len() <= 4);
1719
}
1820

‎tests/pass/align_offset_symbolic.rs

+9-7
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,33 @@ fn test_align_to() {
3636
{
3737
let (l, m, r) = unsafe { s[1..].align_to::<u32>() };
3838
assert_eq!(l.len(), 3);
39-
assert_eq!(m.len(), N-1);
39+
assert_eq!(m.len(), N - 1);
4040
assert_eq!(r.len(), 0);
4141
assert_eq!(raw.wrapping_offset(4), m.as_ptr() as *const u8);
4242
}
4343

4444
{
45-
let (l, m, r) = unsafe { s[..4*N - 1].align_to::<u32>() };
45+
let (l, m, r) = unsafe { s[..4 * N - 1].align_to::<u32>() };
4646
assert_eq!(l.len(), 0);
47-
assert_eq!(m.len(), N-1);
47+
assert_eq!(m.len(), N - 1);
4848
assert_eq!(r.len(), 3);
4949
assert_eq!(raw, m.as_ptr() as *const u8);
5050
}
5151

5252
{
53-
let (l, m, r) = unsafe { s[1..4*N - 1].align_to::<u32>() };
53+
let (l, m, r) = unsafe { s[1..4 * N - 1].align_to::<u32>() };
5454
assert_eq!(l.len(), 3);
55-
assert_eq!(m.len(), N-2);
55+
assert_eq!(m.len(), N - 2);
5656
assert_eq!(r.len(), 3);
5757
assert_eq!(raw.wrapping_offset(4), m.as_ptr() as *const u8);
5858
}
5959

6060
{
61-
#[repr(align(8))] struct Align8(u64);
61+
#[repr(align(8))]
62+
struct Align8(u64);
63+
6264
let (l, m, r) = unsafe { s.align_to::<Align8>() }; // requested alignment higher than allocation alignment
63-
assert_eq!(l.len(), 4*N);
65+
assert_eq!(l.len(), 4 * N);
6466
assert_eq!(r.len(), 0);
6567
assert_eq!(m.len(), 0);
6668
}

‎tests/pass/backtrace/backtrace-api-v0.rs

+19-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
11
// normalize-stderr-test: "::<.*>" -> ""
22

3-
#[inline(never)] fn func_a() -> Box<[*mut ()]> { func_b::<u8>() }
4-
#[inline(never)] fn func_b<T>() -> Box<[*mut ()]> { func_c() }
3+
#[inline(never)]
4+
fn func_a() -> Box<[*mut ()]> {
5+
func_b::<u8>()
6+
}
7+
#[inline(never)]
8+
fn func_b<T>() -> Box<[*mut ()]> {
9+
func_c()
10+
}
511

612
macro_rules! invoke_func_d {
7-
() => { func_d() }
13+
() => {
14+
func_d()
15+
};
816
}
917

10-
#[inline(never)] fn func_c() -> Box<[*mut ()]> { invoke_func_d!() }
11-
#[inline(never)] fn func_d() -> Box<[*mut ()]> { unsafe { miri_get_backtrace(0) } }
18+
#[inline(never)]
19+
fn func_c() -> Box<[*mut ()]> {
20+
invoke_func_d!()
21+
}
22+
#[inline(never)]
23+
fn func_d() -> Box<[*mut ()]> {
24+
unsafe { miri_get_backtrace(0) }
25+
}
1226

1327
fn main() {
1428
let mut seen_main = false;
@@ -51,4 +65,3 @@ struct MiriFrame {
5165
colno: u32,
5266
fn_ptr: *mut (),
5367
}
54-

‎tests/pass/backtrace/backtrace-api-v0.stdout

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$DIR/backtrace-api-v0.rs:11:59 (func_d)
2-
$DIR/backtrace-api-v0.rs:10:50 (func_c)
3-
$DIR/backtrace-api-v0.rs:4:53 (func_b)
4-
$DIR/backtrace-api-v0.rs:3:50 (func_a)
5-
$DIR/backtrace-api-v0.rs:15:18 (main)
1+
$DIR/backtrace-api-v0.rs:24:14 (func_d)
2+
$DIR/backtrace-api-v0.rs:20:5 (func_c)
3+
$DIR/backtrace-api-v0.rs:9:5 (func_b)
4+
$DIR/backtrace-api-v0.rs:5:5 (func_a)
5+
$DIR/backtrace-api-v0.rs:29:18 (main)

‎tests/pass/backtrace/backtrace-api-v1.rs

+24-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
11
// normalize-stderr-test: "::<.*>" -> ""
22

3-
#[inline(never)] fn func_a() -> Box<[*mut ()]> { func_b::<u8>() }
4-
#[inline(never)] fn func_b<T>() -> Box<[*mut ()]> { func_c() }
3+
#[inline(never)]
4+
fn func_a() -> Box<[*mut ()]> {
5+
func_b::<u8>()
6+
}
7+
#[inline(never)]
8+
fn func_b<T>() -> Box<[*mut ()]> {
9+
func_c()
10+
}
511

612
macro_rules! invoke_func_d {
7-
() => { func_d() }
13+
() => {
14+
func_d()
15+
};
816
}
917

10-
#[inline(never)] fn func_c() -> Box<[*mut ()]> { invoke_func_d!() }
11-
#[inline(never)] fn func_d() -> Box<[*mut ()]> { unsafe { let count = miri_backtrace_size(0); let mut buf = vec![std::ptr::null_mut(); count]; miri_get_backtrace(1, buf.as_mut_ptr()); buf.into() } }
18+
#[inline(never)]
19+
fn func_c() -> Box<[*mut ()]> {
20+
invoke_func_d!()
21+
}
22+
#[inline(never)]
23+
fn func_d() -> Box<[*mut ()]> {
24+
unsafe {
25+
let count = miri_backtrace_size(0);
26+
let mut buf = vec![std::ptr::null_mut(); count];
27+
miri_get_backtrace(1, buf.as_mut_ptr());
28+
buf.into()
29+
}
30+
}
1231

1332
fn main() {
1433
let mut seen_main = false;

‎tests/pass/backtrace/backtrace-api-v1.stdout

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$DIR/backtrace-api-v1.rs:11:144 (func_d)
2-
$DIR/backtrace-api-v1.rs:10:50 (func_c)
3-
$DIR/backtrace-api-v1.rs:4:53 (func_b)
4-
$DIR/backtrace-api-v1.rs:3:50 (func_a)
5-
$DIR/backtrace-api-v1.rs:15:18 (main)
1+
$DIR/backtrace-api-v1.rs:27:9 (func_d)
2+
$DIR/backtrace-api-v1.rs:20:5 (func_c)
3+
$DIR/backtrace-api-v1.rs:9:5 (func_b)
4+
$DIR/backtrace-api-v1.rs:5:5 (func_a)
5+
$DIR/backtrace-api-v1.rs:34:18 (main)

‎tests/pass/backtrace/backtrace-std.rs

+19-5
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,29 @@
44

55
use std::backtrace::Backtrace;
66

7-
#[inline(never)] fn func_a() -> Backtrace { func_b::<u8>() }
8-
#[inline(never)] fn func_b<T>() -> Backtrace { func_c() }
7+
#[inline(never)]
8+
fn func_a() -> Backtrace {
9+
func_b::<u8>()
10+
}
11+
#[inline(never)]
12+
fn func_b<T>() -> Backtrace {
13+
func_c()
14+
}
915

1016
macro_rules! invoke_func_d {
11-
() => { func_d() }
17+
() => {
18+
func_d()
19+
};
1220
}
1321

14-
#[inline(never)] fn func_c() -> Backtrace { invoke_func_d!() }
15-
#[inline(never)] fn func_d() -> Backtrace { Backtrace::capture() }
22+
#[inline(never)]
23+
fn func_c() -> Backtrace {
24+
invoke_func_d!()
25+
}
26+
#[inline(never)]
27+
fn func_d() -> Backtrace {
28+
Backtrace::capture()
29+
}
1630

1731
fn main() {
1832
eprint!("{}", func_a());

‎tests/pass/binary-heap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn drain() {
2626
for x in heap.drain() {
2727
sum += x;
2828
}
29-
assert_eq!(sum, 127*128/2);
29+
assert_eq!(sum, 127 * 128 / 2);
3030

3131
assert!(heap.is_empty());
3232
}

‎tests/pass/binops.rs

+8-11
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,18 @@ struct P {
5656
}
5757

5858
fn p(x: isize, y: isize) -> P {
59-
P {
60-
x: x,
61-
y: y
62-
}
59+
P { x: x, y: y }
6360
}
6461

6562
fn test_class() {
66-
let q = p(1, 2);
67-
let mut r = p(1, 2);
63+
let q = p(1, 2);
64+
let mut r = p(1, 2);
6865

69-
assert_eq!(q, r);
70-
r.y = 17;
71-
assert!((r.y != q.y));
72-
assert_eq!(r.y, 17);
73-
assert!((q != r));
66+
assert_eq!(q, r);
67+
r.y = 17;
68+
assert!((r.y != q.y));
69+
assert_eq!(r.y, 17);
70+
assert!((q != r));
7471
}
7572

7673
pub fn main() {

‎tests/pass/box.rs

+27-28
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,34 @@ fn main() {
66
boxed_pair_to_vec();
77
}
88

9-
fn into_raw() { unsafe {
10-
let b = Box::new(4i32);
11-
let r = Box::into_raw(b);
12-
13-
// "lose the tag"
14-
let r2 = ((r as usize)+0) as *mut i32;
15-
*(&mut *r2) = 7;
16-
17-
// Use original ptr again
18-
*(&mut *r) = 17;
19-
drop(Box::from_raw(r));
20-
}}
9+
fn into_raw() {
10+
unsafe {
11+
let b = Box::new(4i32);
12+
let r = Box::into_raw(b);
13+
14+
// "lose the tag"
15+
let r2 = ((r as usize) + 0) as *mut i32;
16+
*(&mut *r2) = 7;
17+
18+
// Use original ptr again
19+
*(&mut *r) = 17;
20+
drop(Box::from_raw(r));
21+
}
22+
}
2123

22-
fn into_unique() { unsafe {
23-
let b = Box::new(4i32);
24-
let u = Box::into_unique(b).0;
24+
fn into_unique() {
25+
unsafe {
26+
let b = Box::new(4i32);
27+
let u = Box::into_unique(b).0;
2528

26-
// "lose the tag"
27-
let r = ((u.as_ptr() as usize)+0) as *mut i32;
28-
*(&mut *r) = 7;
29+
// "lose the tag"
30+
let r = ((u.as_ptr() as usize) + 0) as *mut i32;
31+
*(&mut *r) = 7;
2932

30-
// Use original ptr again.
31-
drop(Box::from_raw(u.as_ptr()));
32-
}}
33+
// Use original ptr again.
34+
drop(Box::from_raw(u.as_ptr()));
35+
}
36+
}
3337

3438
fn boxed_pair_to_vec() {
3539
#[repr(C)]
@@ -44,15 +48,10 @@ fn boxed_pair_to_vec() {
4448
fn reinterstruct(box_pair: Box<PairFoo>) -> Vec<Foo> {
4549
let ref_pair = Box::leak(box_pair) as *mut PairFoo;
4650
let ptr_foo = unsafe { &mut (*ref_pair).fst as *mut Foo };
47-
unsafe {
48-
Vec::from_raw_parts(ptr_foo, 2, 2)
49-
}
51+
unsafe { Vec::from_raw_parts(ptr_foo, 2, 2) }
5052
}
5153

52-
let pair_foo = Box::new(PairFoo {
53-
fst: Foo(42),
54-
snd: Foo(1337),
55-
});
54+
let pair_foo = Box::new(PairFoo { fst: Foo(42), snd: Foo(1337) });
5655
println!("pair_foo = {:?}", pair_foo);
5756
for (n, foo) in reinterstruct(pair_foo).into_iter().enumerate() {
5857
println!("foo #{} = {:?}", n, foo);

‎tests/pass/calls.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ fn call() -> i32 {
77

88
fn factorial_recursive() -> i64 {
99
fn fact(n: i64) -> i64 {
10-
if n == 0 {
11-
1
12-
} else {
13-
n * fact(n - 1)
14-
}
10+
if n == 0 { 1 } else { n * fact(n - 1) }
1511
}
1612
fact(10)
1713
}
1814

1915
fn call_generic() -> (i16, bool) {
20-
fn id<T>(t: T) -> T { t }
16+
fn id<T>(t: T) -> T {
17+
t
18+
}
2119
(id(42), id(true))
2220
}
2321

@@ -26,7 +24,9 @@ fn cross_crate_fn_call() -> i64 {
2624
if 1i32.is_positive() { 1 } else { 0 }
2725
}
2826

29-
const fn foo(i: i64) -> i64 { *&i + 1 }
27+
const fn foo(i: i64) -> i64 {
28+
*&i + 1
29+
}
3030

3131
fn const_fn_call() -> i64 {
3232
let x = 5 + foo(5);

0 commit comments

Comments
 (0)