Skip to content

Commit 0eb958a

Browse files
cjgillotcjgillot
committed
Rebless.
1 parent 669b99d commit 0eb958a

15 files changed

+45
-45
lines changed

‎tests/mir-opt/const_allocation.main.ConstProp.after.32bit.mir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ fn main() -> () {
1818
}
1919

2020
ALLOC0 (static: FOO, size: 8, align: 4) {
21-
╾─ALLOC1──╼ 03 00 00 00 │ ╾──╼....
21+
╾─ALLOC1─╼ 03 00 00 00 │ ╾──╼....
2222
}
2323

2424
ALLOC1 (size: 48, align: 4) {
2525
0x00 │ 00 00 00 00 __ __ __ __ ╾─ALLOC2──╼ 00 00 00 00 │ ....░░░░╾──╼....
26-
0x10 │ 00 00 00 00 __ __ __ __ ╾─ALLOC3──╼ 02 00 00 00 │ ....░░░░╾──╼....
27-
0x20 │ 01 00 00 00 2a 00 00 00 ╾─ALLOC4──╼ 03 00 00 00 │ ....*...╾──╼....
26+
0x10 │ 00 00 00 00 __ __ __ __ ╾─ALLOC3─╼ 02 00 00 00 │ ....░░░░╾──╼....
27+
0x20 │ 01 00 00 00 2a 00 00 00 ╾─ALLOC4─╼ 03 00 00 00 │ ....*...╾──╼....
2828
}
2929

3030
ALLOC2 (size: 0, align: 4) {}
3131

3232
ALLOC3 (size: 16, align: 4) {
33-
╾─ALLOC5──╼ 03 00 00 00 ╾─ALLOC6──╼ 03 00 00 00 │ ╾──╼....╾──╼....
33+
╾─ALLOC5──╼ 03 00 00 00 ╾─ALLOC6─╼ 03 00 00 00 │ ╾──╼....╾──╼....
3434
}
3535

3636
ALLOC5 (size: 3, align: 1) {
@@ -42,8 +42,8 @@ ALLOC6 (size: 3, align: 1) {
4242
}
4343

4444
ALLOC4 (size: 24, align: 4) {
45-
0x00 │ ╾─ALLOC7──╼ 03 00 00 00 ╾─ALLOC8──╼ 03 00 00 00 │ ╾──╼....╾──╼....
46-
0x10 │ ╾─ALLOC9──╼ 04 00 00 00 │ ╾──╼....
45+
0x00 │ ╾─ALLOC7─╼ 03 00 00 00 ╾─ALLOC8─╼ 03 00 00 00 │ ╾──╼....╾──╼....
46+
0x10 │ ╾─ALLOC9─╼ 04 00 00 00 │ ╾──╼....
4747
}
4848

4949
ALLOC7 (size: 3, align: 1) {

‎tests/mir-opt/const_allocation.main.ConstProp.after.64bit.mir

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ fn main() -> () {
1818
}
1919

2020
ALLOC0 (static: FOO, size: 16, align: 8) {
21-
╾───────ALLOC1────────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
21+
╾───────ALLOC1───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
2222
}
2323

2424
ALLOC1 (size: 72, align: 8) {
2525
0x00 │ 00 00 00 00 __ __ __ __ ╾───────ALLOC2────────╼ │ ....░░░░╾──────╼
2626
0x10 │ 00 00 00 00 00 00 00 00 00 00 00 00 __ __ __ __ │ ............░░░░
27-
0x20 │ ╾───────ALLOC3────────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........
28-
0x30 │ 01 00 00 00 2a 00 00 00 ╾───────ALLOC4────────╼ │ ....*...╾──────╼
27+
0x20 │ ╾───────ALLOC3───────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........
28+
0x30 │ 01 00 00 00 2a 00 00 00 ╾───────ALLOC4───────╼ │ ....*...╾──────╼
2929
0x40 │ 03 00 00 00 00 00 00 00 │ ........
3030
}
3131

3232
ALLOC2 (size: 0, align: 8) {}
3333

3434
ALLOC3 (size: 32, align: 8) {
3535
0x00 │ ╾───────ALLOC5────────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
36-
0x10 │ ╾───────ALLOC6────────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
36+
0x10 │ ╾───────ALLOC6───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
3737
}
3838

3939
ALLOC5 (size: 3, align: 1) {
@@ -45,9 +45,9 @@ ALLOC6 (size: 3, align: 1) {
4545
}
4646

4747
ALLOC4 (size: 48, align: 8) {
48-
0x00 │ ╾───────ALLOC7────────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
49-
0x10 │ ╾───────ALLOC8────────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
50-
0x20 │ ╾───────ALLOC9────────╼ 04 00 00 00 00 00 00 00 │ ╾──────╼........
48+
0x00 │ ╾───────ALLOC7───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
49+
0x10 │ ╾───────ALLOC8───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
50+
0x20 │ ╾───────ALLOC9───────╼ 04 00 00 00 00 00 00 00 │ ╾──────╼........
5151
}
5252

5353
ALLOC7 (size: 3, align: 1) {

‎tests/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ fn main() -> () {
1818
}
1919

2020
ALLOC0 (static: FOO, size: 8, align: 4) {
21-
╾─ALLOC1──╼ 03 00 00 00 │ ╾──╼....
21+
╾─ALLOC1─╼ 03 00 00 00 │ ╾──╼....
2222
}
2323

2424
ALLOC1 (size: 48, align: 4) {
25-
0x00 │ 00 00 00 00 __ __ __ __ ╾─ALLOC2──╼ 00 00 00 00 │ ....░░░░╾──╼....
26-
0x10 │ 00 00 00 00 __ __ __ __ ╾─ALLOC3──╼ 02 00 00 00 │ ....░░░░╾──╼....
27-
0x20 │ 01 00 00 00 2a 00 00 00 ╾─ALLOC4──╼ 03 00 00 00 │ ....*...╾──╼....
25+
0x00 │ 00 00 00 00 __ __ __ __ ╾─ALLOC2─╼ 00 00 00 00 │ ....░░░░╾──╼....
26+
0x10 │ 00 00 00 00 __ __ __ __ ╾─ALLOC3─╼ 02 00 00 00 │ ....░░░░╾──╼....
27+
0x20 │ 01 00 00 00 2a 00 00 00 ╾─ALLOC4─╼ 03 00 00 00 │ ....*...╾──╼....
2828
}
2929

3030
ALLOC2 (size: 0, align: 4) {}
3131

3232
ALLOC3 (size: 8, align: 4) {
33-
╾─ALLOC5──╼ ╾─ALLOC6──╼ │ ╾──╼╾──╼
33+
╾─ALLOC5─╼ ╾─ALLOC6─╼ │ ╾──╼╾──╼
3434
}
3535

3636
ALLOC5 (size: 1, align: 1) {
@@ -42,7 +42,7 @@ ALLOC6 (size: 1, align: 1) {
4242
}
4343

4444
ALLOC4 (size: 12, align: 4) {
45-
╾─A7+0x3──╼ ╾─ALLOC8──╼ ╾─A9+0x2──╼ │ ╾──╼╾──╼╾──╼
45+
╾─A7+0x3─╼ ╾─ALLOC8─╼ ╾─A9+0x2─╼ │ ╾──╼╾──╼╾──╼
4646
}
4747

4848
ALLOC7 (size: 4, align: 1) {

‎tests/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ fn main() -> () {
1818
}
1919

2020
ALLOC0 (static: FOO, size: 16, align: 8) {
21-
╾───────ALLOC1────────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
21+
╾───────ALLOC1───────╼ 03 00 00 00 00 00 00 00 │ ╾──────╼........
2222
}
2323

2424
ALLOC1 (size: 72, align: 8) {
25-
0x00 │ 00 00 00 00 __ __ __ __ ╾───────ALLOC2────────╼ │ ....░░░░╾──────╼
25+
0x00 │ 00 00 00 00 __ __ __ __ ╾───────ALLOC2───────╼ │ ....░░░░╾──────╼
2626
0x10 │ 00 00 00 00 00 00 00 00 00 00 00 00 __ __ __ __ │ ............░░░░
27-
0x20 │ ╾───────ALLOC3────────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........
28-
0x30 │ 01 00 00 00 2a 00 00 00 ╾───────ALLOC4────────╼ │ ....*...╾──────╼
27+
0x20 │ ╾───────ALLOC3───────╼ 02 00 00 00 00 00 00 00 │ ╾──────╼........
28+
0x30 │ 01 00 00 00 2a 00 00 00 ╾───────ALLOC4───────╼ │ ....*...╾──────╼
2929
0x40 │ 03 00 00 00 00 00 00 00 │ ........
3030
}
3131

3232
ALLOC2 (size: 0, align: 8) {}
3333

3434
ALLOC3 (size: 16, align: 8) {
35-
╾───────ALLOC5────────╼ ╾───────ALLOC6────────╼ │ ╾──────╼╾──────╼
35+
╾───────ALLOC5───────╼ ╾───────ALLOC6───────╼ │ ╾──────╼╾──────╼
3636
}
3737

3838
ALLOC5 (size: 1, align: 1) {
@@ -44,8 +44,8 @@ ALLOC6 (size: 1, align: 1) {
4444
}
4545

4646
ALLOC4 (size: 24, align: 8) {
47-
0x00 │ ╾─────ALLOC7+0x3──────╼ ╾───────ALLOC8────────╼ │ ╾──────╼╾──────╼
48-
0x10 │ ╾─────ALLOC9+0x2──────╼ │ ╾──────╼
47+
0x00 │ ╾─────ALLOC7+0x3─────╼ ╾───────ALLOC8───────╼ │ ╾──────╼╾──────╼
48+
0x10 │ ╾─────ALLOC9+0x2─────╼ │ ╾──────╼
4949
}
5050

5151
ALLOC7 (size: 4, align: 1) {

‎tests/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn main() -> () {
1818
}
1919

2020
ALLOC0 (static: FOO, size: 4, align: 4) {
21-
╾─ALLOC1──╼ │ ╾──╼
21+
╾─ALLOC1─╼ │ ╾──╼
2222
}
2323

2424
ALLOC1 (size: 168, align: 1) {
@@ -31,7 +31,7 @@ ALLOC1 (size: 168, align: 1) {
3131
0x60 │ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
3232
0x70 │ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
3333
0x80 │ 00 00 00 00 00 00 00 00 00 00 ╾─ALLOC3──╼ 00 00 │ ..........╾──╼..
34-
0x90 │ ╾A4+0x63──╼ 00 00 00 00 00 00 00 00 00 00 00 00 │ ╾──╼............
34+
0x90 │ ╾A4+0x63─╼ 00 00 00 00 00 00 00 00 00 00 00 00 │ ╾──╼............
3535
0xa0 │ 00 00 00 00 00 00 00 00 │ ........
3636
}
3737

‎tests/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn main() -> () {
1818
}
1919

2020
ALLOC0 (static: FOO, size: 8, align: 8) {
21-
╾───────ALLOC1────────╼ │ ╾──────╼
21+
╾───────ALLOC1───────╼ │ ╾──────╼
2222
}
2323

2424
ALLOC1 (size: 180, align: 1) {
@@ -31,7 +31,7 @@ ALLOC1 (size: 180, align: 1) {
3131
0x60 │ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
3232
0x70 │ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
3333
0x80 │ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ╾──── │ ..............╾─
34-
0x90 │ ─────ALLOC3─────╼ 00 00 ╾────ALLOC4+0x63──────╼ │ ─────╼..╾──────╼
34+
0x90 │ ─────ALLOC3─────╼ 00 00 ╾────ALLOC4+0x63─────╼ │ ─────╼..╾──────╼
3535
0xa0 │ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
3636
0xb0 │ 00 00 00 00 │ ....
3737
}

‎tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
}
114114

115115
ALLOC1 (static: RC, size: 4, align: 4) {
116-
╾─ALLOC2──╼ │ ╾──╼
116+
╾─ALLOC2─╼ │ ╾──╼
117117
}
118118

119119
ALLOC2 (size: 8, align: 4) {

‎tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
}
114114

115115
ALLOC1 (static: RC, size: 8, align: 8) {
116-
╾───────ALLOC2────────╼ │ ╾──────╼
116+
╾───────ALLOC2───────╼ │ ╾──────╼
117117
}
118118

119119
ALLOC2 (size: 8, align: 4) {

‎tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
}
121121

122122
ALLOC0 (static: STAT, size: 4, align: 4) {
123-
╾─ALLOC1──╼ │ ╾──╼
123+
╾─ALLOC1─╼ │ ╾──╼
124124
}
125125

126126
ALLOC1 (size: 16, align: 4) {

‎tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
}
121121

122122
ALLOC0 (static: STAT, size: 8, align: 8) {
123-
╾───────ALLOC1────────╼ │ ╾──────╼
123+
╾───────ALLOC1───────╼ │ ╾──────╼
124124
}
125125

126126
ALLOC1 (size: 16, align: 4) {

‎tests/ui/consts/const-eval/raw-bytes.32bit.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ LL | pub static S7: &[u16] = unsafe {
556556
|
557557
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
558558
= note: the raw bytes of the constant (size: 8, align: 4) {
559-
╾A31+0x2──╼ 04 00 00 00 │ ╾──╼....
559+
╾A31+0x2─╼ 04 00 00 00 │ ╾──╼....
560560
}
561561

562562
error[E0080]: it is undefined behavior to use this value

‎tests/ui/consts/const-eval/ub-incorrect-vtable.32bit.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LL | const INVALID_VTABLE_SIZE: &dyn Trait =
1717
|
1818
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
1919
= note: the raw bytes of the constant (size: 8, align: 4) {
20-
╾─ALLOC3──╼ ╾─ALLOC2──╼ │ ╾──╼╾──╼
20+
╾─ALLOC3─╼ ╾─ALLOC2─╼ │ ╾──╼╾──╼
2121
}
2222

2323
error[E0080]: it is undefined behavior to use this value
@@ -28,7 +28,7 @@ LL | const INVALID_VTABLE_ALIGNMENT_UB: W<&dyn Trait> =
2828
|
2929
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
3030
= note: the raw bytes of the constant (size: 8, align: 4) {
31-
╾─ALLOC5──╼ ╾─ALLOC4──╼ │ ╾──╼╾──╼
31+
╾─ALLOC5─╼ ╾─ALLOC4─╼ │ ╾──╼╾──╼
3232
}
3333

3434
error[E0080]: it is undefined behavior to use this value
@@ -39,7 +39,7 @@ LL | const INVALID_VTABLE_SIZE_UB: W<&dyn Trait> =
3939
|
4040
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
4141
= note: the raw bytes of the constant (size: 8, align: 4) {
42-
╾─ALLOC7──╼ ╾─ALLOC6──╼ │ ╾──╼╾──╼
42+
╾─ALLOC7─╼ ╾─ALLOC6─╼ │ ╾──╼╾──╼
4343
}
4444

4545
error[E0080]: it is undefined behavior to use this value
@@ -50,7 +50,7 @@ LL | const INVALID_VTABLE_UB: W<&dyn Trait> =
5050
|
5151
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
5252
= note: the raw bytes of the constant (size: 8, align: 4) {
53-
╾─ALLOC9──╼ ╾─ALLOC8──╼ │ ╾──╼╾──╼
53+
╾─ALLOC9─╼ ╾─ALLOC8─╼ │ ╾──╼╾──╼
5454
}
5555

5656
error[E0080]: it is undefined behavior to use this value

‎tests/ui/consts/const-eval/ub-incorrect-vtable.64bit.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LL | const INVALID_VTABLE_SIZE: &dyn Trait =
1717
|
1818
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
1919
= note: the raw bytes of the constant (size: 16, align: 8) {
20-
╾───────ALLOC3────────╼ ╾───────ALLOC2────────╼ │ ╾──────╼╾──────╼
20+
╾───────ALLOC3───────╼ ╾───────ALLOC2───────╼ │ ╾──────╼╾──────╼
2121
}
2222

2323
error[E0080]: it is undefined behavior to use this value
@@ -28,7 +28,7 @@ LL | const INVALID_VTABLE_ALIGNMENT_UB: W<&dyn Trait> =
2828
|
2929
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
3030
= note: the raw bytes of the constant (size: 16, align: 8) {
31-
╾───────ALLOC5────────╼ ╾───────ALLOC4────────╼ │ ╾──────╼╾──────╼
31+
╾───────ALLOC5───────╼ ╾───────ALLOC4───────╼ │ ╾──────╼╾──────╼
3232
}
3333

3434
error[E0080]: it is undefined behavior to use this value
@@ -39,7 +39,7 @@ LL | const INVALID_VTABLE_SIZE_UB: W<&dyn Trait> =
3939
|
4040
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
4141
= note: the raw bytes of the constant (size: 16, align: 8) {
42-
╾───────ALLOC7────────╼ ╾───────ALLOC6────────╼ │ ╾──────╼╾──────╼
42+
╾───────ALLOC7───────╼ ╾───────ALLOC6───────╼ │ ╾──────╼╾──────╼
4343
}
4444

4545
error[E0080]: it is undefined behavior to use this value
@@ -50,7 +50,7 @@ LL | const INVALID_VTABLE_UB: W<&dyn Trait> =
5050
|
5151
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
5252
= note: the raw bytes of the constant (size: 16, align: 8) {
53-
╾───────ALLOC9────────╼ ╾───────ALLOC8────────╼ │ ╾──────╼╾──────╼
53+
╾───────ALLOC9───────╼ ╾───────ALLOC8───────╼ │ ╾──────╼╾──────╼
5454
}
5555

5656
error[E0080]: it is undefined behavior to use this value

‎tests/ui/consts/miri_unleashed/mutable_references_err.32bit.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LL | const BLUNT: &mut i32 = &mut 42;
2828
|
2929
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
3030
= note: the raw bytes of the constant (size: 4, align: 4) {
31-
╾─ALLOC3──╼ │ ╾──╼
31+
╾─ALLOC3─╼ │ ╾──╼
3232
}
3333

3434
warning: skipping const checks

‎tests/ui/consts/miri_unleashed/mutable_references_err.64bit.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ LL | const BLUNT: &mut i32 = &mut 42;
2828
|
2929
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
3030
= note: the raw bytes of the constant (size: 8, align: 8) {
31-
╾───────ALLOC3────────╼ │ ╾──────╼
31+
╾───────ALLOC3───────╼ │ ╾──────╼
3232
}
3333

3434
warning: skipping const checks

0 commit comments

Comments
 (0)