Skip to content

Commit 12932f4

Browse files
ZalatharZalathar
committed
coverage: Format all remaining tests
These tests can simply be reformatted as normal, because the resulting changes are unimportant.
1 parent 6fb99c6 commit 12932f4

15 files changed

+60
-46
lines changed

‎tests/coverage/closure_macro.cov-map

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
Function name: closure_macro::load_configuration_files
2-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 1d, 01, 02, 02]
2+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 1e, 01, 02, 02]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 0
66
Number of file 0 mappings: 1
7-
- Code(Counter(0)) at (prev + 29, 1) to (start + 2, 2)
7+
- Code(Counter(0)) at (prev + 30, 1) to (start + 2, 2)
88

99
Function name: closure_macro::main
10-
Raw bytes (43): 0x[01, 01, 02, 01, 05, 05, 02, 07, 01, 21, 01, 01, 21, 02, 02, 09, 00, 0f, 05, 00, 12, 00, 13, 02, 00, 12, 00, 13, 05, 00, 54, 00, 55, 02, 02, 09, 02, 0b, 07, 03, 01, 00, 02]
10+
Raw bytes (43): 0x[01, 01, 02, 01, 05, 05, 02, 07, 01, 22, 01, 01, 21, 02, 02, 09, 00, 0f, 05, 00, 12, 00, 13, 02, 00, 12, 00, 13, 05, 00, 54, 00, 55, 02, 02, 09, 02, 0b, 07, 03, 01, 00, 02]
1111
Number of files: 1
1212
- file 0 => global file 1
1313
Number of expressions: 2
1414
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
1515
- expression 1 operands: lhs = Counter(1), rhs = Expression(0, Sub)
1616
Number of file 0 mappings: 7
17-
- Code(Counter(0)) at (prev + 33, 1) to (start + 1, 33)
17+
- Code(Counter(0)) at (prev + 34, 1) to (start + 1, 33)
1818
- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 15)
1919
= (c0 - c1)
2020
- Code(Counter(1)) at (prev + 0, 18) to (start + 0, 19)
@@ -27,10 +27,10 @@ Number of file 0 mappings: 7
2727
= (c1 + (c0 - c1))
2828

2929
Function name: closure_macro::main::{closure#0}
30-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 23, 12, 00, 54]
30+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 24, 12, 00, 54]
3131
Number of files: 1
3232
- file 0 => global file 1
3333
Number of expressions: 0
3434
Number of file 0 mappings: 1
35-
- Code(Counter(0)) at (prev + 35, 18) to (start + 0, 84)
35+
- Code(Counter(0)) at (prev + 36, 18) to (start + 0, 84)
3636

‎tests/coverage/closure_macro.coverage

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
LL| |// compile-flags: --edition=2018
21
LL| |#![feature(coverage_attribute)]
2+
LL| |// edition: 2018
33
LL| |
44
LL| |macro_rules! bail {
55
LL| | ($msg:literal $(,)?) => {
@@ -14,7 +14,8 @@
1414
LL| |
1515
LL| |macro_rules! on_error {
1616
LL| | ($value:expr, $error_message:expr) => {
17-
LL| | $value.or_else(|e| { // FIXME(85000): no coverage in closure macros
17+
LL| | $value.or_else(|e| {
18+
LL| | // FIXME(85000): no coverage in closure macros
1819
LL| | let message = format!($error_message, e);
1920
LL| | if message.len() > 0 {
2021
LL| | println!("{}", message);

‎tests/coverage/closure_macro.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// compile-flags: --edition=2018
21
#![feature(coverage_attribute)]
2+
// edition: 2018
33

44
macro_rules! bail {
55
($msg:literal $(,)?) => {
@@ -14,7 +14,8 @@ macro_rules! bail {
1414

1515
macro_rules! on_error {
1616
($value:expr, $error_message:expr) => {
17-
$value.or_else(|e| { // FIXME(85000): no coverage in closure macros
17+
$value.or_else(|e| {
18+
// FIXME(85000): no coverage in closure macros
1819
let message = format!($error_message, e);
1920
if message.len() > 0 {
2021
println!("{}", message);

‎tests/coverage/coroutine.cov-map

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
Function name: coroutine::get_u32
2-
Raw bytes (28): 0x[01, 01, 02, 01, 05, 05, 02, 04, 01, 0b, 01, 01, 0b, 05, 01, 0e, 00, 13, 02, 00, 1d, 00, 3c, 07, 01, 01, 00, 02]
2+
Raw bytes (28): 0x[01, 01, 02, 01, 05, 05, 02, 04, 01, 0b, 01, 01, 0b, 05, 02, 09, 00, 0e, 02, 02, 09, 00, 28, 07, 02, 01, 00, 02]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 2
66
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
77
- expression 1 operands: lhs = Counter(1), rhs = Expression(0, Sub)
88
Number of file 0 mappings: 4
99
- Code(Counter(0)) at (prev + 11, 1) to (start + 1, 11)
10-
- Code(Counter(1)) at (prev + 1, 14) to (start + 0, 19)
11-
- Code(Expression(0, Sub)) at (prev + 0, 29) to (start + 0, 60)
10+
- Code(Counter(1)) at (prev + 2, 9) to (start + 0, 14)
11+
- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 40)
1212
= (c0 - c1)
13-
- Code(Expression(1, Add)) at (prev + 1, 1) to (start + 0, 2)
13+
- Code(Expression(1, Add)) at (prev + 2, 1) to (start + 0, 2)
1414
= (c1 + (c0 - c1))
1515

1616
Function name: coroutine::main
17-
Raw bytes (65): 0x[01, 01, 08, 07, 0d, 05, 09, 11, 15, 1e, 19, 11, 15, 15, 19, 1e, 19, 11, 15, 09, 01, 0f, 01, 02, 16, 01, 07, 0b, 00, 2e, 11, 01, 2b, 00, 2d, 03, 01, 0e, 00, 35, 11, 02, 0b, 00, 2e, 1e, 01, 22, 00, 27, 1a, 00, 2c, 00, 2e, 17, 01, 0e, 00, 35, 1a, 02, 01, 00, 02]
17+
Raw bytes (65): 0x[01, 01, 08, 07, 0d, 05, 09, 11, 15, 1e, 19, 11, 15, 15, 19, 1e, 19, 11, 15, 09, 01, 13, 01, 02, 16, 01, 07, 0b, 00, 2e, 11, 01, 2b, 00, 2d, 03, 01, 0e, 00, 35, 11, 02, 0b, 00, 2e, 1e, 01, 22, 00, 27, 1a, 00, 2c, 00, 2e, 17, 01, 0e, 00, 35, 1a, 02, 01, 00, 02]
1818
Number of files: 1
1919
- file 0 => global file 1
2020
Number of expressions: 8
@@ -27,7 +27,7 @@ Number of expressions: 8
2727
- expression 6 operands: lhs = Expression(7, Sub), rhs = Counter(6)
2828
- expression 7 operands: lhs = Counter(4), rhs = Counter(5)
2929
Number of file 0 mappings: 9
30-
- Code(Counter(0)) at (prev + 15, 1) to (start + 2, 22)
30+
- Code(Counter(0)) at (prev + 19, 1) to (start + 2, 22)
3131
- Code(Counter(0)) at (prev + 7, 11) to (start + 0, 46)
3232
- Code(Counter(4)) at (prev + 1, 43) to (start + 0, 45)
3333
- Code(Expression(0, Add)) at (prev + 1, 14) to (start + 0, 53)
@@ -43,11 +43,11 @@ Number of file 0 mappings: 9
4343
= ((c4 - c5) - c6)
4444

4545
Function name: coroutine::main::{closure#0}
46-
Raw bytes (14): 0x[01, 01, 00, 02, 01, 11, 1c, 01, 1f, 05, 02, 10, 01, 06]
46+
Raw bytes (14): 0x[01, 01, 00, 02, 01, 15, 1c, 01, 1f, 05, 02, 10, 01, 06]
4747
Number of files: 1
4848
- file 0 => global file 1
4949
Number of expressions: 0
5050
Number of file 0 mappings: 2
51-
- Code(Counter(0)) at (prev + 17, 28) to (start + 1, 31)
51+
- Code(Counter(0)) at (prev + 21, 28) to (start + 1, 31)
5252
- Code(Counter(1)) at (prev + 2, 16) to (start + 1, 6)
5353

‎tests/coverage/coroutine.coverage

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
LL| |// drop all `Counter` `Coverage` statements from a MIR. `simplify.rs` has logic
1010
LL| |// to handle this condition, and still report dead block coverage.
1111
LL| 1|fn get_u32(val: bool) -> Result<u32, String> {
12-
LL| 1| if val { Ok(1) } else { Err(String::from("some error")) }
13-
^0
12+
LL| 1| if val {
13+
LL| 1| Ok(1)
14+
LL| | } else {
15+
LL| 0| Err(String::from("some error"))
16+
LL| | }
1417
LL| 1|}
1518
LL| |
1619
LL| 1|fn main() {

‎tests/coverage/coroutine.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ use std::pin::Pin;
99
// drop all `Counter` `Coverage` statements from a MIR. `simplify.rs` has logic
1010
// to handle this condition, and still report dead block coverage.
1111
fn get_u32(val: bool) -> Result<u32, String> {
12-
if val { Ok(1) } else { Err(String::from("some error")) }
12+
if val {
13+
Ok(1)
14+
} else {
15+
Err(String::from("some error"))
16+
}
1317
}
1418

1519
fn main() {

‎tests/coverage/inline-dead.cov-map

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
Function name: inline_dead::dead (unused)
2-
Raw bytes (9): 0x[01, 01, 00, 01, 00, 19, 01, 02, 02]
2+
Raw bytes (9): 0x[01, 01, 00, 01, 00, 17, 01, 02, 02]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 0
66
Number of file 0 mappings: 1
7-
- Code(Zero) at (prev + 25, 1) to (start + 2, 2)
7+
- Code(Zero) at (prev + 23, 1) to (start + 2, 2)
88

99
Function name: inline_dead::live::<false>
10-
Raw bytes (28): 0x[01, 01, 02, 01, 00, 00, 02, 04, 01, 10, 01, 01, 09, 00, 02, 09, 00, 0f, 02, 02, 09, 00, 0a, 07, 02, 01, 00, 02]
10+
Raw bytes (28): 0x[01, 01, 02, 01, 00, 00, 02, 04, 01, 0e, 01, 01, 09, 00, 02, 09, 00, 0f, 02, 02, 09, 00, 0a, 07, 02, 01, 00, 02]
1111
Number of files: 1
1212
- file 0 => global file 1
1313
Number of expressions: 2
1414
- expression 0 operands: lhs = Counter(0), rhs = Zero
1515
- expression 1 operands: lhs = Zero, rhs = Expression(0, Sub)
1616
Number of file 0 mappings: 4
17-
- Code(Counter(0)) at (prev + 16, 1) to (start + 1, 9)
17+
- Code(Counter(0)) at (prev + 14, 1) to (start + 1, 9)
1818
- Code(Zero) at (prev + 2, 9) to (start + 0, 15)
1919
- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 10)
2020
= (c0 - Zero)
2121
- Code(Expression(1, Add)) at (prev + 2, 1) to (start + 0, 2)
2222
= (Zero + (c0 - Zero))
2323

2424
Function name: inline_dead::main
25-
Raw bytes (14): 0x[01, 01, 00, 02, 01, 04, 01, 03, 0d, 01, 07, 06, 02, 02]
25+
Raw bytes (14): 0x[01, 01, 00, 02, 01, 04, 01, 03, 0d, 01, 05, 06, 02, 02]
2626
Number of files: 1
2727
- file 0 => global file 1
2828
Number of expressions: 0
2929
Number of file 0 mappings: 2
3030
- Code(Counter(0)) at (prev + 4, 1) to (start + 3, 13)
31-
- Code(Counter(0)) at (prev + 7, 6) to (start + 2, 2)
31+
- Code(Counter(0)) at (prev + 5, 6) to (start + 2, 2)
3232

3333
Function name: inline_dead::main::{closure#0}
34-
Raw bytes (23): 0x[01, 01, 02, 00, 06, 01, 00, 03, 01, 07, 17, 01, 16, 00, 02, 0d, 00, 0e, 03, 02, 05, 00, 06]
34+
Raw bytes (23): 0x[01, 01, 02, 00, 06, 01, 00, 03, 01, 07, 17, 01, 16, 00, 01, 17, 00, 18, 03, 01, 05, 00, 06]
3535
Number of files: 1
3636
- file 0 => global file 1
3737
Number of expressions: 2
3838
- expression 0 operands: lhs = Zero, rhs = Expression(1, Sub)
3939
- expression 1 operands: lhs = Counter(0), rhs = Zero
4040
Number of file 0 mappings: 3
4141
- Code(Counter(0)) at (prev + 7, 23) to (start + 1, 22)
42-
- Code(Zero) at (prev + 2, 13) to (start + 0, 14)
43-
- Code(Expression(0, Add)) at (prev + 2, 5) to (start + 0, 6)
42+
- Code(Zero) at (prev + 1, 23) to (start + 0, 24)
43+
- Code(Expression(0, Add)) at (prev + 1, 5) to (start + 0, 6)
4444
= (Zero + (c0 - Zero))
4545

‎tests/coverage/inline-dead.coverage

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
LL| 1| println!("{}", live::<false>());
66
LL| 1|
77
LL| 1| let f = |x: bool| {
8-
LL| 1| debug_assert!(
9-
LL| 0| x
10-
LL| | );
8+
LL| 1| debug_assert!(x);
9+
^0
1110
LL| 1| };
1211
LL| 1| f(false);
1312
LL| 1|}

‎tests/coverage/inline-dead.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ fn main() {
55
println!("{}", live::<false>());
66

77
let f = |x: bool| {
8-
debug_assert!(
9-
x
10-
);
8+
debug_assert!(x);
119
};
1210
f(false);
1311
}

‎tests/coverage/partial_eq.cov-map

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ Number of file 0 mappings: 1
5555
- Code(Counter(0)) at (prev + 12, 5) to (start + 6, 6)
5656

5757
Function name: partial_eq::main
58-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 15, 01, 05, 02]
58+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 15, 01, 0a, 02]
5959
Number of files: 1
6060
- file 0 => global file 1
6161
Number of expressions: 0
6262
Number of file 0 mappings: 1
63-
- Code(Counter(0)) at (prev + 21, 1) to (start + 5, 2)
63+
- Code(Counter(0)) at (prev + 21, 1) to (start + 10, 2)
6464

‎tests/coverage/partial_eq.coverage

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
LL| 1| let version_3_2_1 = Version::new(3, 2, 1);
2424
LL| 1| let version_3_3_0 = Version::new(3, 3, 0);
2525
LL| 1|
26-
LL| 1| println!("{:?} < {:?} = {}", version_3_2_1, version_3_3_0, version_3_2_1 < version_3_3_0);
26+
LL| 1| println!(
27+
LL| 1| "{:?} < {:?} = {}",
28+
LL| 1| version_3_2_1,
29+
LL| 1| version_3_3_0,
30+
LL| 1| version_3_2_1 < version_3_3_0
31+
LL| 1| );
2732
LL| 1|}
2833
LL| |
2934
LL| |/*

‎tests/coverage/partial_eq.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ fn main() {
2222
let version_3_2_1 = Version::new(3, 2, 1);
2323
let version_3_3_0 = Version::new(3, 3, 0);
2424

25-
println!("{:?} < {:?} = {}", version_3_2_1, version_3_3_0, version_3_2_1 < version_3_3_0);
25+
println!(
26+
"{:?} < {:?} = {}",
27+
version_3_2_1,
28+
version_3_3_0,
29+
version_3_2_1 < version_3_3_0
30+
);
2631
}
2732

2833
/*

‎tests/coverage/thin-lto.cov-map

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Function name: thin_lto::main
2-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 03, 01, 01, 02]
2+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 03, 01, 00, 11]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 0
66
Number of file 0 mappings: 1
7-
- Code(Counter(0)) at (prev + 3, 1) to (start + 1, 2)
7+
- Code(Counter(0)) at (prev + 3, 1) to (start + 0, 17)
88

‎tests/coverage/thin-lto.coverage

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
LL| |// compile-flags: -O -C lto=thin -C prefer-dynamic=no
22
LL| |
3-
LL| 1|pub fn main() {
4-
LL| 1|}
3+
LL| 1|pub fn main() {}
54

‎tests/coverage/thin-lto.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
// compile-flags: -O -C lto=thin -C prefer-dynamic=no
22

3-
pub fn main() {
4-
}
3+
pub fn main() {}

0 commit comments

Comments
 (0)