Skip to content

Commit 6f62766

Browse files
committed
Renamed tests to avoid exceeding Windows max path limit
1 parent f5aebad commit 6f62766

File tree

126 files changed

+586
-592
lines changed

Some content is hidden

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

126 files changed

+586
-592
lines changed

compiler/rustc_mir/src/util/pretty.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,7 @@ fn dump_matched_mir_node<'tcx, F>(
154154
dump_file_basename(tcx, pass_num, pass_name, disambiguator, body.source);
155155
let mut file = create_dump_file_with_basename(tcx, &file_basename, "html")?;
156156
if body.source.def_id().is_local() {
157-
write_mir_fn_spanview(
158-
tcx,
159-
body,
160-
spanview,
161-
&file_basename,
162-
&mut file,
163-
)?;
157+
write_mir_fn_spanview(tcx, body, spanview, &file_basename, &mut file)?;
164158
}
165159
};
166160
}

src/test/run-make-fulldeps/instrument-coverage-llvm-ir-base/Makefile src/test/run-make-fulldeps/coverage-llvmir-base/Makefile

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

33
# ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
44
# `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
5-
# See ../instrument-coverage/coverage_tools.mk for more information.
5+
# See ../coverage/coverage_tools.mk for more information.
66

7-
-include ../instrument-coverage/coverage_tools.mk
7+
-include ../coverage/coverage_tools.mk
88

9-
BASEDIR=../instrument-coverage-llvm-ir-base
9+
BASEDIR=../coverage-llvmir-base
1010

1111
ifeq ($(UNAME),Darwin)
1212
INSTR_PROF_DATA_SUFFIX=,regular,live_support

src/test/run-make-fulldeps/instrument-coverage-llvm-ir-link-dead-code/Makefile src/test/run-make-fulldeps/coverage-llvmir-deadcode/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
55
LINK_DEAD_CODE=yes
66

7-
-include ../instrument-coverage-llvm-ir-base/Makefile
7+
-include ../coverage-llvmir-base/Makefile
88

99
# ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
1010
# `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
11-
# See ../instrument-coverage/coverage_tools.mk for more information.
11+
# See ../coverage/coverage_tools.mk for more information.

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/Makefile src/test/run-make-fulldeps/coverage-reports-base/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
# ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
88
# `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
9-
# See ../instrument-coverage/coverage_tools.mk for more information.
9+
# See ../coverage/coverage_tools.mk for more information.
1010

11-
-include ../instrument-coverage/coverage_tools.mk
11+
-include ../coverage/coverage_tools.mk
1212

13-
BASEDIR=../instrument-coverage-cov-reports-base
14-
SOURCEDIR=../instrument-coverage
13+
BASEDIR=../coverage-reports-base
14+
SOURCEDIR=../coverage
1515

1616
all: $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
1717

Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/closure.rs",
6+
"filename": "../coverage/closure.rs",
77
"summary": {
88
"functions": {
99
"count": 5,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/drop_trait.rs",
6+
"filename": "../coverage/drop_trait.rs",
77
"summary": {
88
"functions": {
99
"count": 2,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/generics.rs",
6+
"filename": "../coverage/generics.rs",
77
"summary": {
88
"functions": {
99
"count": 3,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if.json src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.if.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/if.rs",
6+
"filename": "../coverage/if.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/if_else.rs",
6+
"filename": "../coverage/if_else.rs",
77
"summary": {
88
"functions": {
99
"count": 1,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.inner_items.json src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.inner_items.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/inner_items.rs",
6+
"filename": "../coverage/inner_items.rs",
77
"summary": {
88
"functions": {
99
"count": 4,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.lazy_boolean.json src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.lazy_boolean.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/lazy_boolean.rs",
6+
"filename": "../coverage/lazy_boolean.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/loop_break_value.rs",
6+
"filename": "../coverage/loop_break_value.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/simple_loop.rs",
6+
"filename": "../coverage/simple_loop.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/simple_match.rs",
6+
"filename": "../coverage/simple_match.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/question_mark_error_result.rs",
6+
"filename": "../coverage/try_error_result.rs",
77
"summary": {
88
"functions": {
99
"count": 2,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/various_conditions.rs",
6+
"filename": "../coverage/various_conditions.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/while_early_return.rs",
6+
"filename": "../coverage/while_early_return.rs",
77
"summary": {
88
"functions": {
99
"count": 1,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_show_coverage.inner_items.txt src/test/run-make-fulldeps/coverage-reports-base/expected_show_coverage.inner_items.txt

+18-18
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,46 @@
1111
11| 1| countdown = 10;
1212
12| 1| }
1313
13| |
14-
14| | mod inner_mod {
15-
15| | const INNER_MOD_CONST: u32 = 1000;
14+
14| | mod in_mod {
15+
15| | const IN_MOD_CONST: u32 = 1000;
1616
16| | }
1717
17| |
18-
18| | fn inner_function(a: u32) {
18+
18| | fn in_func(a: u32) {
1919
19| 3| let b = 1;
2020
20| 3| let c = a + b;
2121
21| 3| println!("c = {}", c)
2222
22| 3| }
2323
23| |
24-
24| | struct InnerStruct {
25-
25| | inner_struct_field: u32,
24+
24| | struct InStruct {
25+
25| | in_struct_field: u32,
2626
26| | }
2727
27| |
28-
28| | const INNER_CONST: u32 = 1234;
28+
28| | const IN_CONST: u32 = 1234;
2929
29| |
30-
30| | trait InnerTrait {
31-
31| | fn inner_trait_func(&mut self, incr: u32);
30+
30| | trait InTrait {
31+
31| | fn trait_func(&mut self, incr: u32);
3232
32| |
3333
33| 1| fn default_trait_func(&mut self) {
34-
34| 1| inner_function(INNER_CONST);
35-
35| 1| self.inner_trait_func(INNER_CONST);
34+
34| 1| in_func(IN_CONST);
35+
35| 1| self.trait_func(IN_CONST);
3636
36| 1| }
3737
37| | }
3838
38| |
39-
39| | impl InnerTrait for InnerStruct {
40-
40| | fn inner_trait_func(&mut self, incr: u32) {
41-
41| 1| self.inner_struct_field += incr;
42-
42| 1| inner_function(self.inner_struct_field);
39+
39| | impl InTrait for InStruct {
40+
40| | fn trait_func(&mut self, incr: u32) {
41+
41| 1| self.in_struct_field += incr;
42+
42| 1| in_func(self.in_struct_field);
4343
43| 1| }
4444
44| | }
4545
45| |
46-
46| | type InnerType = String;
46+
46| | type InType = String;
4747
47| |
4848
48| 1| if is_true {
49-
49| 1| inner_function(countdown);
49+
49| 1| in_func(countdown);
5050
50| 1| }
5151
51| |
52-
52| 1| let mut val = InnerStruct {
53-
53| 1| inner_struct_field: 101,
52+
52| 1| let mut val = InStruct {
53+
53| 1| in_struct_field: 101,
5454
54| 1| };
5555
55| 1|
5656
56| 1| val.default_trait_func();

src/test/run-make-fulldeps/instrument-coverage-cov-reports-link-dead-code/Makefile src/test/run-make-fulldeps/coverage-reports-deadcode/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
# LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
99
LINK_DEAD_CODE=yes
1010

11-
-include ../instrument-coverage-cov-reports-base/Makefile
11+
-include ../coverage-reports-base/Makefile
1212

1313
# ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
1414
# `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
15-
# See ../instrument-coverage/coverage_tools.mk for more information.
15+
# See ../coverage/coverage_tools.mk for more information.

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.closure.json src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.closure.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/closure.rs",
6+
"filename": "../coverage/closure.rs",
77
"summary": {
88
"functions": {
99
"count": 5,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.drop_trait.json src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.drop_trait.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/drop_trait.rs",
6+
"filename": "../coverage/drop_trait.rs",
77
"summary": {
88
"functions": {
99
"count": 2,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.generics.json src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.generics.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/generics.rs",
6+
"filename": "../coverage/generics.rs",
77
"summary": {
88
"functions": {
99
"count": 3,
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/if.rs",
6+
"filename": "../coverage/if.rs",
77
"summary": {
88
"functions": {
99
"count": 1,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.if_else.json src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.if_else.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/if_else.rs",
6+
"filename": "../coverage/if_else.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/inner_items.rs",
6+
"filename": "../coverage/inner_items.rs",
77
"summary": {
88
"functions": {
99
"count": 4,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/lazy_boolean.rs",
6+
"filename": "../coverage/lazy_boolean.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/loop_break_value.rs",
6+
"filename": "../coverage/loop_break_value.rs",
77
"summary": {
88
"functions": {
99
"count": 1,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_loop.json src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_loop.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/simple_loop.rs",
6+
"filename": "../coverage/simple_loop.rs",
77
"summary": {
88
"functions": {
99
"count": 1,

src/test/run-make-fulldeps/instrument-coverage-cov-reports-base/expected_export_coverage.simple_match.json src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.simple_match.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/simple_match.rs",
6+
"filename": "../coverage/simple_match.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/question_mark_error_result.rs",
6+
"filename": "../coverage/try_error_result.rs",
77
"summary": {
88
"functions": {
99
"count": 2,
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/various_conditions.rs",
6+
"filename": "../coverage/various_conditions.rs",
77
"summary": {
88
"functions": {
99
"count": 1,
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"files": [
55
{
6-
"filename": "../instrument-coverage/while_early_return.rs",
6+
"filename": "../coverage/while_early_return.rs",
77
"summary": {
88
"functions": {
99
"count": 1,

0 commit comments

Comments
 (0)