Skip to content

Commit 402f322

Browse files
dtolnaydtolnay
committed
Bless all pretty printer tests and ui tests
1 parent 8ac05b9 commit 402f322

19 files changed

+210
-234
lines changed

‎src/test/pretty/ast-stmt-expr-attr.rs

+37-37
Original file line numberDiff line numberDiff line change
@@ -28,67 +28,67 @@ fn syntax() {
2828
let _ = #[attr] (x as Y);
2929
let _ =
3030
#[attr] while true {
31-
#![attr]
32-
};
31+
#![attr]
32+
};
3333
let _ =
3434
#[attr] while let Some(false) = true {
35-
#![attr]
36-
};
35+
#![attr]
36+
};
3737
let _ =
3838
#[attr] for x in y {
39-
#![attr]
40-
};
39+
#![attr]
40+
};
4141
let _ =
4242
#[attr] loop {
43-
#![attr]
44-
};
43+
#![attr]
44+
};
4545
let _ =
4646
#[attr] match true {
47-
#![attr]
48-
#[attr]
49-
_ => false,
50-
};
47+
#![attr]
48+
#[attr]
49+
_ => false,
50+
};
5151
let _ = #[attr] || #[attr] foo;
5252
let _ = #[attr] move || #[attr] foo;
5353
let _ =
5454
#[attr] ||
55-
#[attr] {
56-
#![attr]
57-
foo
58-
};
55+
#[attr] {
56+
#![attr]
57+
foo
58+
};
5959
let _ =
6060
#[attr] move ||
61-
#[attr] {
62-
#![attr]
63-
foo
64-
};
61+
#[attr] {
62+
#![attr]
63+
foo
64+
};
6565
let _ =
6666
#[attr] ||
67-
{
68-
#![attr]
69-
foo
70-
};
67+
{
68+
#![attr]
69+
foo
70+
};
7171
let _ =
7272
#[attr] move ||
73-
{
74-
#![attr]
75-
foo
76-
};
73+
{
74+
#![attr]
75+
foo
76+
};
7777
let _ =
7878
#[attr] {
79-
#![attr]
80-
};
79+
#![attr]
80+
};
8181
let _ =
8282
#[attr] {
83-
#![attr]
84-
let _ = ();
85-
};
83+
#![attr]
84+
let _ = ();
85+
};
8686
let _ =
8787
#[attr] {
88-
#![attr]
89-
let _ = ();
90-
foo
91-
};
88+
#![attr]
89+
let _ = ();
90+
foo
91+
};
9292
let _ = #[attr] x = y;
9393
let _ = #[attr] (x = y);
9494
let _ = #[attr] x += y;

‎src/test/pretty/block-comment-trailing-whitespace2.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// pp-exact
44
fn f() {} /*
5-
The next line should not be indented.
5+
The next line should not be indented.
66
7-
That one. It shouldn't have been indented.
8-
*/
7+
That one. It shouldn't have been indented.
8+
*/

‎src/test/pretty/block-comment-wchar.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@
9393
// Taken from https://www.unicode.org/Public/UNIDATA/PropList.txt
9494
let chars =
9595
['\x0A', '\x0B', '\x0C', '\x0D', '\x20', '\u{85}', '\u{A0}',
96-
'\u{1680}', '\u{2000}', '\u{2001}', '\u{2002}', '\u{2003}',
97-
'\u{2004}', '\u{2005}', '\u{2006}', '\u{2007}', '\u{2008}',
98-
'\u{2009}', '\u{200A}', '\u{2028}', '\u{2029}', '\u{202F}',
99-
'\u{205F}', '\u{3000}'];
96+
'\u{1680}', '\u{2000}', '\u{2001}', '\u{2002}', '\u{2003}',
97+
'\u{2004}', '\u{2005}', '\u{2006}', '\u{2007}', '\u{2008}',
98+
'\u{2009}', '\u{200A}', '\u{2028}', '\u{2029}', '\u{202F}',
99+
'\u{205F}', '\u{3000}'];
100100
for c in &chars { let ws = c.is_whitespace(); println!("{} {}", c, ws); }
101101
}

‎src/test/pretty/delimited-token-groups.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,32 @@ mac! {
1717

1818
mac! {
1919
a(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
20-
aaaaaaaa aaaaaaaa) a
20+
aaaaaaaa aaaaaaaa) a
2121
[aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
22-
aaaaaaaa aaaaaaaa] a
22+
aaaaaaaa aaaaaaaa] a
2323
{
2424
aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
2525
aaaaaaaa aaaaaaaa aaaaaaaa
2626
} a
2727
}
2828

2929
mac!(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
30-
aaaaaaaa aaaaaaaa);
30+
aaaaaaaa aaaaaaaa);
3131
mac![aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
32-
aaaaaaaa aaaaaaaa];
32+
aaaaaaaa aaaaaaaa];
3333
mac! {
3434
aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
3535
aaaaaaaa aaaaaaaa
3636
}
3737

3838
#[rustc_dummy(aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
39-
aaaaaaaa aaaaaaaa aaaaaaaa)]
39+
aaaaaaaa aaaaaaaa aaaaaaaa)]
4040
#[rustc_dummy[aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
41-
aaaaaaaa aaaaaaaa aaaaaaaa]]
41+
aaaaaaaa aaaaaaaa aaaaaaaa]]
4242
#[rustc_dummy {
43-
aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
44-
aaaaaaaa aaaaaaaa
45-
}]
43+
aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa
44+
aaaaaaaa aaaaaaaa
45+
}]
4646
#[rustc_dummy =
47-
"aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa"]
47+
"aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa aaaaaaaa"]
4848
fn main() {}

‎src/test/pretty/issue-4264.pp

+25-45
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
pub fn foo(_: [i32; (3 as usize)]) ({ } as ())
1212

1313
pub fn bar() ({
14-
const FOO: usize = ((5 as usize) - (4 as usize) as usize);
15-
let _: [(); (FOO as usize)] = ([(() as ())] as [(); 1]);
14+
const FOO: usize = ((5 as usize) - (4 as usize) as usize);
15+
let _: [(); (FOO as usize)] = ([(() as ())] as [(); 1]);
1616

17-
let _: [(); (1 as usize)] = ([(() as ())] as [(); 1]);
17+
let _: [(); (1 as usize)] = ([(() as ())] as [(); 1]);
1818

19-
let _ =
20-
(((&([(1 as i32), (2 as i32), (3 as i32)] as [i32; 3])
21-
as &[i32; 3]) as *const _ as *const [i32; 3]) as
22-
*const [i32; (3 as usize)] as *const [i32; 3]);
19+
let _ =
20+
(((&([(1 as i32), (2 as i32), (3 as i32)] as [i32; 3]) as
21+
&[i32; 3]) as *const _ as *const [i32; 3]) as
22+
*const [i32; (3 as usize)] as *const [i32; 3]);
2323

2424

2525

@@ -29,29 +29,19 @@
2929

3030

3131

32-
({
33-
let res =
34-
((::alloc::fmt::format as
35-
for<'r> fn(Arguments<'r>) -> String {format})(((::core::fmt::Arguments::new_v1
36-
as
37-
fn(&[&'static str], &[ArgumentV1]) -> Arguments {Arguments::new_v1})((&([("test"
38-
as
39-
&str)]
40-
as
41-
[&str; 1])
42-
as
43-
&[&str; 1]),
44-
(&([]
45-
as
46-
[ArgumentV1; 0])
47-
as
48-
&[ArgumentV1; 0]))
49-
as
50-
Arguments))
51-
as String);
52-
(res as String)
53-
} as String);
54-
} as ())
32+
({
33+
let res =
34+
((::alloc::fmt::format as
35+
for<'r> fn(Arguments<'r>) -> String {format})(((::core::fmt::Arguments::new_v1
36+
as
37+
fn(&[&'static str], &[ArgumentV1]) -> Arguments {Arguments::new_v1})((&([("test"
38+
as &str)] as [&str; 1]) as
39+
&[&str; 1]),
40+
(&([] as [ArgumentV1; 0]) as &[ArgumentV1; 0])) as
41+
Arguments)) as String);
42+
(res as String)
43+
} as String);
44+
} as ())
5545
pub type Foo = [i32; (3 as usize)];
5646
pub struct Bar {
5747
pub x: [i32; (3 as usize)],
@@ -60,19 +50,9 @@
6050
pub enum Baz { BazVariant([i32; (5 as usize)]), }
6151
pub fn id<T>(x: T) -> T ({ (x as T) } as T)
6252
pub fn use_id() ({
63-
let _ =
64-
((id::<[i32; (3 as usize)]> as
65-
fn([i32; 3]) -> [i32; 3] {id::<[i32; 3]>})(([(1
66-
as
67-
i32),
68-
(2
69-
as
70-
i32),
71-
(3
72-
as
73-
i32)]
74-
as
75-
[i32; 3]))
76-
as [i32; 3]);
77-
} as ())
53+
let _ =
54+
((id::<[i32; (3 as usize)]> as
55+
fn([i32; 3]) -> [i32; 3] {id::<[i32; 3]>})(([(1 as i32),
56+
(2 as i32), (3 as i32)] as [i32; 3])) as [i32; 3]);
57+
} as ())
7858
fn main() ({ } as ())

‎src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ struct C {
99
#[allow()]
1010
const C: C =
1111
C{
12-
#[cfg(debug_assertions)]
13-
field: 0,
12+
#[cfg(debug_assertions)]
13+
field: 0,
1414

15-
#[cfg(not(debug_assertions))]
16-
field: 1,};
15+
#[cfg(not(debug_assertions))]
16+
field: 1,};

‎src/test/pretty/macro_rules.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ macro_rules! matcher_brackets {
1212

1313
macro_rules! all_fragments {
1414
($b : block, $e : expr, $i : ident, $it : item, $l : lifetime, $lit :
15-
literal, $m : meta, $p : pat, $pth : path, $s : stmt, $tt : tt, $ty : ty,
16-
$vis : vis) => {} ;
15+
literal, $m : meta, $p : pat, $pth : path, $s : stmt, $tt : tt, $ty : ty,
16+
$vis : vis) => {} ;
1717
}
1818

1919
fn main() {}

‎src/test/pretty/match-naked-expr-medium.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ fn main() {
55
let _y =
66
match x {
77
Some(_) =>
8-
["some(_)".to_string(), "not".to_string(), "SO".to_string(),
9-
"long".to_string(), "string".to_string()],
8+
["some(_)".to_string(), "not".to_string(), "SO".to_string(),
9+
"long".to_string(), "string".to_string()],
1010
None =>
11-
["none".to_string(), "a".to_string(), "a".to_string(),
12-
"a".to_string(), "a".to_string()],
11+
["none".to_string(), "a".to_string(), "a".to_string(),
12+
"a".to_string(), "a".to_string()],
1313
};
1414
}

0 commit comments

Comments
 (0)