Skip to content

Commit 953f33c

Browse files
borsbors
committed
Auto merge of #76854 - aDotInTheVoid:mir-opt-32-64-diff-name, r=oli-obk
Rename mir-opt diff tests with 32/64 bit Now syntax highlighting should work. I've tested that `--bless` works localy, but I'm not sure it's possible on CI Fixes #75746 r? `@oli-obk`
2 parents a0925fb + 735776d commit 953f33c

File tree

77 files changed

+215
-4
lines changed

Some content is hidden

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

77 files changed

+215
-4
lines changed

‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.32bit renamed to ‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.64bit renamed to ‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.64bit.mir

File renamed without changes.

‎src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.32bit renamed to ‎src/test/mir-opt/combine_array_len.norm2.InstCombine.32bit.diff

File renamed without changes.

‎src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.64bit renamed to ‎src/test/mir-opt/combine_array_len.norm2.InstCombine.64bit.diff

File renamed without changes.

‎src/test/mir-opt/const_allocation.main.ConstProp.after.mir.32bit renamed to ‎src/test/mir-opt/const_allocation.main.ConstProp.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/const_allocation.main.ConstProp.after.mir.64bit renamed to ‎src/test/mir-opt/const_allocation.main.ConstProp.after.64bit.mir

File renamed without changes.

‎src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.32bit renamed to ‎src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.64bit renamed to ‎src/test/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir

File renamed without changes.

‎src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.32bit renamed to ‎src/test/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.64bit renamed to ‎src/test/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir

File renamed without changes.

‎src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/const_prop/array_index.main.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.32bit renamed to ‎src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.64bit renamed to ‎src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.64bit.mir

File renamed without changes.

‎src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/const_prop/repeat.main.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/graphviz.main.mir_map.0.dot.mir

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
digraph Mir_0_3 {
2+
graph [fontname="Courier, monospace"];
3+
node [fontname="Courier, monospace"];
4+
edge [fontname="Courier, monospace"];
5+
label=<fn main() -&gt; ()<br align="left"/>>;
6+
bb0__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">0</td></tr><tr><td align="left" balign="left">_0 = const ()<br/></td></tr><tr><td align="left">goto</td></tr></table>>];
7+
bb1__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">1</td></tr><tr><td align="left">resume</td></tr></table>>];
8+
bb2__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">2</td></tr><tr><td align="left">return</td></tr></table>>];
9+
bb0__0_3 -> bb2__0_3 [label=""];
10+
}

‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.32bit renamed to ‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff

File renamed without changes.

‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.64bit renamed to ‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.64bit.diff

File renamed without changes.

‎src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.32bit renamed to ‎src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.64bit renamed to ‎src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.64bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_72181.bar.mir_map.0.mir.32bit renamed to ‎src/test/mir-opt/issue_72181.bar.mir_map.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_72181.bar.mir_map.0.mir.64bit renamed to ‎src/test/mir-opt/issue_72181.bar.mir_map.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_72181.foo.mir_map.0.mir.32bit renamed to ‎src/test/mir-opt/issue_72181.foo.mir_map.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_72181.foo.mir_map.0.mir.64bit renamed to ‎src/test/mir-opt/issue_72181.foo.mir_map.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_72181.main.mir_map.0.mir.32bit renamed to ‎src/test/mir-opt/issue_72181.main.mir_map.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_72181.main.mir_map.0.mir.64bit renamed to ‎src/test/mir-opt/issue_72181.main.mir_map.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/issue_73223.main.PreCodegen.diff.32bit renamed to ‎src/test/mir-opt/issue_73223.main.PreCodegen.32bit.diff

File renamed without changes.

‎src/test/mir-opt/issue_73223.main.PreCodegen.diff.64bit renamed to ‎src/test/mir-opt/issue_73223.main.PreCodegen.64bit.diff

File renamed without changes.

‎src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.32bit renamed to ‎src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.32bit.diff

File renamed without changes.

‎src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.64bit renamed to ‎src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.64bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.32bit renamed to ‎src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.32bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.64bit renamed to ‎src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.64bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.32bit renamed to ‎src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.64bit renamed to ‎src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.64bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.32bit renamed to ‎src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.32bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.64bit renamed to ‎src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.64bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.32bit renamed to ‎src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.32bit.diff

File renamed without changes.

‎src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.64bit renamed to ‎src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.64bit.diff

File renamed without changes.

‎src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.32bit renamed to ‎src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.64bit renamed to ‎src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.32bit renamed to ‎src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.64bit renamed to ‎src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.64bit.mir

File renamed without changes.

‎src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.32bit renamed to ‎src/test/mir-opt/simple_match.match_bool.mir_map.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.64bit renamed to ‎src/test/mir-opt/simple_match.match_bool.mir_map.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.32bit renamed to ‎src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.32bit.diff

File renamed without changes.

‎src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.64bit renamed to ‎src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.64bit.diff

File renamed without changes.

‎src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.32bit renamed to ‎src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.32bit.diff

File renamed without changes.

‎src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.64bit renamed to ‎src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.64bit.diff

File renamed without changes.

‎src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.32bit renamed to ‎src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.32bit.mir

File renamed without changes.

‎src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.64bit renamed to ‎src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.64bit.mir

File renamed without changes.

‎src/test/mir-opt/spanview_block.main.mir_map.0.html.mir

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>coverage_of_if_else - Code Regions</title>
5+
<style>
6+
.line {
7+
counter-increment: line;
8+
}
9+
.line:before {
10+
content: counter(line) ": ";
11+
font-family: Menlo, Monaco, monospace;
12+
font-style: italic;
13+
width: 3.8em;
14+
display: inline-block;
15+
text-align: right;
16+
filter: opacity(50%);
17+
-webkit-user-select: none;
18+
}
19+
.code {
20+
color: #dddddd;
21+
background-color: #222222;
22+
font-family: Menlo, Monaco, monospace;
23+
line-height: 1.4em;
24+
border-bottom: 2px solid #222222;
25+
white-space: pre;
26+
display: inline-block;
27+
}
28+
.odd {
29+
background-color: #55bbff;
30+
color: #223311;
31+
}
32+
.even {
33+
background-color: #ee7756;
34+
color: #551133;
35+
}
36+
.code {
37+
--index: calc(var(--layer) - 1);
38+
padding-top: calc(var(--index) * 0.15em);
39+
filter:
40+
hue-rotate(calc(var(--index) * 25deg))
41+
saturate(calc(100% - (var(--index) * 2%)))
42+
brightness(calc(100% - (var(--index) * 1.5%)));
43+
}
44+
.annotation {
45+
color: #4444ff;
46+
font-family: monospace;
47+
font-style: italic;
48+
display: none;
49+
-webkit-user-select: none;
50+
}
51+
body:active .annotation {
52+
/* requires holding mouse down anywhere on the page */
53+
display: inline-block;
54+
}
55+
span:hover .annotation {
56+
/* requires hover over a span ONLY on its first line */
57+
display: inline-block;
58+
}
59+
</style>
60+
</head>
61+
<body>
62+
<div class="code" style="counter-reset: line 4"><span class="line"><span class="code" style="--layer: 0">fn main() </span><span><span class="code even" style="--layer: 1" title="0: $DIR/spanview-block.rs:5:11: 5:13:
63+
5:11-5:13: Assign: _0 = const ()
64+
5:13-5:13: Goto: goto -&gt; bb2"><span class="annotation">0⦊</span>{}<span class="annotation">⦉0</span></span></span><span><span class="code odd" style="--layer: 1" title="2: $DIR/spanview-block.rs:5:13: 5:13:
65+
5:13-5:13: Return: return"><span class="annotation">2⦊</span>‸<span class="annotation">⦉2</span></span></span></span></div>
66+
</body>
67+
</html>

‎src/test/mir-opt/spanview_statement.main.mir_map.0.html.mir

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>coverage_of_if_else - Code Regions</title>
5+
<style>
6+
.line {
7+
counter-increment: line;
8+
}
9+
.line:before {
10+
content: counter(line) ": ";
11+
font-family: Menlo, Monaco, monospace;
12+
font-style: italic;
13+
width: 3.8em;
14+
display: inline-block;
15+
text-align: right;
16+
filter: opacity(50%);
17+
-webkit-user-select: none;
18+
}
19+
.code {
20+
color: #dddddd;
21+
background-color: #222222;
22+
font-family: Menlo, Monaco, monospace;
23+
line-height: 1.4em;
24+
border-bottom: 2px solid #222222;
25+
white-space: pre;
26+
display: inline-block;
27+
}
28+
.odd {
29+
background-color: #55bbff;
30+
color: #223311;
31+
}
32+
.even {
33+
background-color: #ee7756;
34+
color: #551133;
35+
}
36+
.code {
37+
--index: calc(var(--layer) - 1);
38+
padding-top: calc(var(--index) * 0.15em);
39+
filter:
40+
hue-rotate(calc(var(--index) * 25deg))
41+
saturate(calc(100% - (var(--index) * 2%)))
42+
brightness(calc(100% - (var(--index) * 1.5%)));
43+
}
44+
.annotation {
45+
color: #4444ff;
46+
font-family: monospace;
47+
font-style: italic;
48+
display: none;
49+
-webkit-user-select: none;
50+
}
51+
body:active .annotation {
52+
/* requires holding mouse down anywhere on the page */
53+
display: inline-block;
54+
}
55+
span:hover .annotation {
56+
/* requires hover over a span ONLY on its first line */
57+
display: inline-block;
58+
}
59+
</style>
60+
</head>
61+
<body>
62+
<div class="code" style="counter-reset: line 4"><span class="line"><span class="code" style="--layer: 0">fn main() </span><span><span class="code even" style="--layer: 1" title="0[0]: $DIR/spanview-statement.rs:5:11: 5:13:
63+
5:11-5:13: Assign: _0 = const ()"><span class="annotation">0[0]⦊</span>{}<span class="annotation">⦉0[0]</span></span></span><span><span class="code odd" style="--layer: 1" title="0:Goto: $DIR/spanview-statement.rs:5:13: 5:13:
64+
5:13-5:13: Goto: goto -&gt; bb2"><span class="annotation">0:Goto⦊</span>‸<span class="annotation">⦉0:Goto</span></span></span><span><span class="code even" style="--layer: 1" title="2:Return: $DIR/spanview-statement.rs:5:13: 5:13:
65+
5:13-5:13: Return: return"><span class="annotation">2:Return⦊</span>‸<span class="annotation">⦉2:Return</span></span></span></span></div>
66+
</body>
67+
</html>

‎src/test/mir-opt/spanview_terminator.main.mir_map.0.html.mir

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>coverage_of_if_else - Code Regions</title>
5+
<style>
6+
.line {
7+
counter-increment: line;
8+
}
9+
.line:before {
10+
content: counter(line) ": ";
11+
font-family: Menlo, Monaco, monospace;
12+
font-style: italic;
13+
width: 3.8em;
14+
display: inline-block;
15+
text-align: right;
16+
filter: opacity(50%);
17+
-webkit-user-select: none;
18+
}
19+
.code {
20+
color: #dddddd;
21+
background-color: #222222;
22+
font-family: Menlo, Monaco, monospace;
23+
line-height: 1.4em;
24+
border-bottom: 2px solid #222222;
25+
white-space: pre;
26+
display: inline-block;
27+
}
28+
.odd {
29+
background-color: #55bbff;
30+
color: #223311;
31+
}
32+
.even {
33+
background-color: #ee7756;
34+
color: #551133;
35+
}
36+
.code {
37+
--index: calc(var(--layer) - 1);
38+
padding-top: calc(var(--index) * 0.15em);
39+
filter:
40+
hue-rotate(calc(var(--index) * 25deg))
41+
saturate(calc(100% - (var(--index) * 2%)))
42+
brightness(calc(100% - (var(--index) * 1.5%)));
43+
}
44+
.annotation {
45+
color: #4444ff;
46+
font-family: monospace;
47+
font-style: italic;
48+
display: none;
49+
-webkit-user-select: none;
50+
}
51+
body:active .annotation {
52+
/* requires holding mouse down anywhere on the page */
53+
display: inline-block;
54+
}
55+
span:hover .annotation {
56+
/* requires hover over a span ONLY on its first line */
57+
display: inline-block;
58+
}
59+
</style>
60+
</head>
61+
<body>
62+
<div class="code" style="counter-reset: line 4"><span class="line"><span class="code" style="--layer: 0">fn main() {}</span><span><span class="code even" style="--layer: 1" title="0:Goto: $DIR/spanview-terminator.rs:5:13: 5:13:
63+
5:13-5:13: Goto: goto -&gt; bb2"><span class="annotation">0:Goto⦊</span>‸<span class="annotation">⦉0:Goto</span></span></span><span><span class="code odd" style="--layer: 1" title="2:Return: $DIR/spanview-terminator.rs:5:13: 5:13:
64+
5:13-5:13: Return: return"><span class="annotation">2:Return⦊</span>‸<span class="annotation">⦉2:Return</span></span></span></span></div>
65+
</body>
66+
</html>

‎src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.32bit renamed to ‎src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.64bit renamed to ‎src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.32bit renamed to ‎src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.64bit renamed to ‎src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.32bit renamed to ‎src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir

File renamed without changes.

‎src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.64bit renamed to ‎src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.64bit.mir

File renamed without changes.

‎src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit renamed to ‎src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir

File renamed without changes.

‎src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit renamed to ‎src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.64bit.mir

File renamed without changes.

‎src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.32bit renamed to ‎src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.32bit.diff

File renamed without changes.

‎src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.64bit renamed to ‎src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.64bit.diff

File renamed without changes.

‎src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.32bit renamed to ‎src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.32bit.mir

File renamed without changes.

‎src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.64bit renamed to ‎src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.64bit.mir

File renamed without changes.

‎src/tools/compiletest/src/runtest.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -3156,12 +3156,12 @@ impl<'test> TestCx<'test> {
31563156

31573157
if self.config.bless {
31583158
for e in
3159-
glob(&format!("{}/{}.*.mir{}", test_dir.display(), test_crate, bit_width)).unwrap()
3159+
glob(&format!("{}/{}.*{}.mir", test_dir.display(), test_crate, bit_width)).unwrap()
31603160
{
31613161
std::fs::remove_file(e.unwrap()).unwrap();
31623162
}
31633163
for e in
3164-
glob(&format!("{}/{}.*.diff{}", test_dir.display(), test_crate, bit_width)).unwrap()
3164+
glob(&format!("{}/{}.*{}.diff", test_dir.display(), test_crate, bit_width)).unwrap()
31653165
{
31663166
std::fs::remove_file(e.unwrap()).unwrap();
31673167
}
@@ -3181,7 +3181,7 @@ impl<'test> TestCx<'test> {
31813181
let trimmed = test_name.trim_end_matches(".diff");
31823182
let test_against = format!("{}.after.mir", trimmed);
31833183
from_file = format!("{}.before.mir", trimmed);
3184-
expected_file = format!("{}{}", test_name, bit_width);
3184+
expected_file = format!("{}{}.diff", trimmed, bit_width);
31853185
assert!(
31863186
test_names.next().is_none(),
31873187
"two mir pass names specified for MIR diff"
@@ -3199,7 +3199,8 @@ impl<'test> TestCx<'test> {
31993199
from_file = format!("{}.{}.mir", test_name, first_pass);
32003200
to_file = Some(second_file);
32013201
} else {
3202-
expected_file = format!("{}{}", test_name, bit_width);
3202+
expected_file =
3203+
format!("{}{}.mir", test_name.trim_end_matches(".mir"), bit_width);
32033204
from_file = test_name.to_string();
32043205
assert!(
32053206
test_names.next().is_none(),

0 commit comments

Comments
 (0)