Renamed tests to avoid exceeding Windows max path limit

rust-lang · Oct 5, 2020 · 6f62766 · 6f62766
1 parent f5aebad
commit 6f62766
Show file tree

Hide file tree

Showing 126 changed files with 586 additions and 592 deletions.
diff --git a/compiler/rustc_mir/src/util/pretty.rs b/compiler/rustc_mir/src/util/pretty.rs
@@ -154,13 +154,7 @@ fn dump_matched_mir_node<'tcx, F>(
                 dump_file_basename(tcx, pass_num, pass_name, disambiguator, body.source);
             let mut file = create_dump_file_with_basename(tcx, &file_basename, "html")?;
             if body.source.def_id().is_local() {
-                write_mir_fn_spanview(
-                    tcx,
-                    body,
-                    spanview,
-                    &file_basename,
-                    &mut file,
-                )?;
+                write_mir_fn_spanview(tcx, body, spanview, &file_basename, &mut file)?;
             }
         };
     }

diff --git a/...instrument-coverage-llvm-ir-base/Makefile → ...ke-fulldeps/coverage-llvmir-base/Makefile b/...instrument-coverage-llvm-ir-base/Makefile → ...ke-fulldeps/coverage-llvmir-base/Makefile
@@ -2,11 +2,11 @@
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
 
--include ../instrument-coverage/coverage_tools.mk
+-include ../coverage/coverage_tools.mk
 
-BASEDIR=../instrument-coverage-llvm-ir-base
+BASEDIR=../coverage-llvmir-base
 
 ifeq ($(UNAME),Darwin)
 	INSTR_PROF_DATA_SUFFIX=,regular,live_support

diff --git a/...erage-llvm-ir-base/filecheck.testprog.txt → ...verage-llvmir-base/filecheck.testprog.txt b/...erage-llvm-ir-base/filecheck.testprog.txt → ...verage-llvmir-base/filecheck.testprog.txt
diff --git a/...trument-coverage-llvm-ir-base/testprog.rs → ...fulldeps/coverage-llvmir-base/testprog.rs b/...trument-coverage-llvm-ir-base/testprog.rs → ...fulldeps/coverage-llvmir-base/testprog.rs
diff --git a/...-coverage-llvm-ir-link-dead-code/Makefile → ...ulldeps/coverage-llvmir-deadcode/Makefile b/...-coverage-llvm-ir-link-dead-code/Makefile → ...ulldeps/coverage-llvmir-deadcode/Makefile
@@ -4,8 +4,8 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../instrument-coverage-llvm-ir-base/Makefile
+-include ../coverage-llvmir-base/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
diff --git a/...rument-coverage-cov-reports-base/Makefile → ...e-fulldeps/coverage-reports-base/Makefile b/...rument-coverage-cov-reports-base/Makefile → ...e-fulldeps/coverage-reports-base/Makefile
@@ -6,12 +6,12 @@
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
 
--include ../instrument-coverage/coverage_tools.mk
+-include ../coverage/coverage_tools.mk
 
-BASEDIR=../instrument-coverage-cov-reports-base
-SOURCEDIR=../instrument-coverage
+BASEDIR=../coverage-reports-base
+SOURCEDIR=../coverage
 
 all: $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
 

diff --git a/...ode/expected_export_coverage.closure.json → ...ase/expected_export_coverage.closure.json b/...ode/expected_export_coverage.closure.json → ...ase/expected_export_coverage.closure.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/closure.rs",
+          "filename": "../coverage/closure.rs",
           "summary": {
             "functions": {
               "count": 5,

diff --git a/.../expected_export_coverage.drop_trait.json → .../expected_export_coverage.drop_trait.json b/.../expected_export_coverage.drop_trait.json → .../expected_export_coverage.drop_trait.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/drop_trait.rs",
+          "filename": "../coverage/drop_trait.rs",
           "summary": {
             "functions": {
               "count": 2,

diff --git a/...de/expected_export_coverage.generics.json → ...se/expected_export_coverage.generics.json b/...de/expected_export_coverage.generics.json → ...se/expected_export_coverage.generics.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/generics.rs",
+          "filename": "../coverage/generics.rs",
           "summary": {
             "functions": {
               "count": 3,

diff --git a/...rts-base/expected_export_coverage.if.json → ...rts-base/expected_export_coverage.if.json b/...rts-base/expected_export_coverage.if.json → ...rts-base/expected_export_coverage.if.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if.rs",
+          "filename": "../coverage/if.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...ode/expected_export_coverage.if_else.json → ...ase/expected_export_coverage.if_else.json b/...ode/expected_export_coverage.if_else.json → ...ase/expected_export_coverage.if_else.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if_else.rs",
+          "filename": "../coverage/if_else.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...expected_export_coverage.inner_items.json → ...expected_export_coverage.inner_items.json b/...expected_export_coverage.inner_items.json → ...expected_export_coverage.inner_items.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/inner_items.rs",
+          "filename": "../coverage/inner_items.rs",
           "summary": {
             "functions": {
               "count": 4,

diff --git a/...xpected_export_coverage.lazy_boolean.json → ...xpected_export_coverage.lazy_boolean.json b/...xpected_export_coverage.lazy_boolean.json → ...xpected_export_coverage.lazy_boolean.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/lazy_boolean.rs",
+          "filename": "../coverage/lazy_boolean.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...ted_export_coverage.loop_break_value.json → ...ted_export_coverage.loop_break_value.json b/...ted_export_coverage.loop_break_value.json → ...ted_export_coverage.loop_break_value.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/loop_break_value.rs",
+          "filename": "../coverage/loop_break_value.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...expected_export_coverage.simple_loop.json → ...expected_export_coverage.simple_loop.json b/...expected_export_coverage.simple_loop.json → ...expected_export_coverage.simple_loop.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_loop.rs",
+          "filename": "../coverage/simple_loop.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...xpected_export_coverage.simple_match.json → ...xpected_export_coverage.simple_match.json b/...xpected_export_coverage.simple_match.json → ...xpected_export_coverage.simple_match.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_match.rs",
+          "filename": "../coverage/simple_match.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/..._coverage.question_mark_error_result.json → ...ted_export_coverage.try_error_result.json b/..._coverage.question_mark_error_result.json → ...ted_export_coverage.try_error_result.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/question_mark_error_result.rs",
+          "filename": "../coverage/try_error_result.rs",
           "summary": {
             "functions": {
               "count": 2,

diff --git a/...d_export_coverage.various_conditions.json → ...d_export_coverage.various_conditions.json b/...d_export_coverage.various_conditions.json → ...d_export_coverage.various_conditions.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/various_conditions.rs",
+          "filename": "../coverage/various_conditions.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...d_export_coverage.while_early_return.json → ...d_export_coverage.while_early_return.json b/...d_export_coverage.while_early_return.json → ...d_export_coverage.while_early_return.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/while_early_return.rs",
+          "filename": "../coverage/while_early_return.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...s-base/expected_show_coverage.closure.txt → ...s-base/expected_show_coverage.closure.txt b/...s-base/expected_show_coverage.closure.txt → ...s-base/expected_show_coverage.closure.txt
diff --git a/...ase/expected_show_coverage.drop_trait.txt → ...ase/expected_show_coverage.drop_trait.txt b/...ase/expected_show_coverage.drop_trait.txt → ...ase/expected_show_coverage.drop_trait.txt
diff --git a/...-base/expected_show_coverage.generics.txt → ...-base/expected_show_coverage.generics.txt b/...-base/expected_show_coverage.generics.txt → ...-base/expected_show_coverage.generics.txt
diff --git a/...eports-base/expected_show_coverage.if.txt → ...eports-base/expected_show_coverage.if.txt b/...eports-base/expected_show_coverage.if.txt → ...eports-base/expected_show_coverage.if.txt
diff --git a/...s-base/expected_show_coverage.if_else.txt → ...s-base/expected_show_coverage.if_else.txt b/...s-base/expected_show_coverage.if_else.txt → ...s-base/expected_show_coverage.if_else.txt
diff --git a/...se/expected_show_coverage.inner_items.txt → ...se/expected_show_coverage.inner_items.txt b/...se/expected_show_coverage.inner_items.txt → ...se/expected_show_coverage.inner_items.txt
@@ -11,46 +11,46 @@
    11|      1|        countdown = 10;
    12|      1|    }
    13|       |
-   14|       |    mod inner_mod {
-   15|       |        const INNER_MOD_CONST: u32 = 1000;
+   14|       |    mod in_mod {
+   15|       |        const IN_MOD_CONST: u32 = 1000;
    16|       |    }
    17|       |
-   18|       |    fn inner_function(a: u32) {
+   18|       |    fn in_func(a: u32) {
    19|      3|        let b = 1;
    20|      3|        let c = a + b;
    21|      3|        println!("c = {}", c)
    22|      3|    }
    23|       |
-   24|       |    struct InnerStruct {
-   25|       |        inner_struct_field: u32,
+   24|       |    struct InStruct {
+   25|       |        in_struct_field: u32,
    26|       |    }
    27|       |
-   28|       |    const INNER_CONST: u32 = 1234;
+   28|       |    const IN_CONST: u32 = 1234;
    29|       |
-   30|       |    trait InnerTrait {
-   31|       |        fn inner_trait_func(&mut self, incr: u32);
+   30|       |    trait InTrait {
+   31|       |        fn trait_func(&mut self, incr: u32);
    32|       |
    33|      1|        fn default_trait_func(&mut self) {
-   34|      1|            inner_function(INNER_CONST);
-   35|      1|            self.inner_trait_func(INNER_CONST);
+   34|      1|            in_func(IN_CONST);
+   35|      1|            self.trait_func(IN_CONST);
    36|      1|        }
    37|       |    }
    38|       |
-   39|       |    impl InnerTrait for InnerStruct {
-   40|       |        fn inner_trait_func(&mut self, incr: u32) {
-   41|      1|            self.inner_struct_field += incr;
-   42|      1|            inner_function(self.inner_struct_field);
+   39|       |    impl InTrait for InStruct {
+   40|       |        fn trait_func(&mut self, incr: u32) {
+   41|      1|            self.in_struct_field += incr;
+   42|      1|            in_func(self.in_struct_field);
    43|      1|        }
    44|       |    }
    45|       |
-   46|       |    type InnerType = String;
+   46|       |    type InType = String;
    47|       |
    48|      1|    if is_true {
-   49|      1|        inner_function(countdown);
+   49|      1|        in_func(countdown);
    50|      1|    }
    51|       |
-   52|      1|    let mut val = InnerStruct {
-   53|      1|        inner_struct_field: 101,
+   52|      1|    let mut val = InStruct {
+   53|      1|        in_struct_field: 101,
    54|      1|    };
    55|      1|
    56|      1|    val.default_trait_func();

diff --git a/...e/expected_show_coverage.lazy_boolean.txt → ...e/expected_show_coverage.lazy_boolean.txt b/...e/expected_show_coverage.lazy_boolean.txt → ...e/expected_show_coverage.lazy_boolean.txt
diff --git a/...pected_show_coverage.loop_break_value.txt → ...pected_show_coverage.loop_break_value.txt b/...pected_show_coverage.loop_break_value.txt → ...pected_show_coverage.loop_break_value.txt
diff --git a/...se/expected_show_coverage.simple_loop.txt → ...se/expected_show_coverage.simple_loop.txt b/...se/expected_show_coverage.simple_loop.txt → ...se/expected_show_coverage.simple_loop.txt
diff --git a/...e/expected_show_coverage.simple_match.txt → ...e/expected_show_coverage.simple_match.txt b/...e/expected_show_coverage.simple_match.txt → ...e/expected_show_coverage.simple_match.txt
diff --git a/...w_coverage.question_mark_error_result.txt → ...pected_show_coverage.try_error_result.txt b/...w_coverage.question_mark_error_result.txt → ...pected_show_coverage.try_error_result.txt
diff --git a/...cted_show_coverage.various_conditions.txt → ...cted_show_coverage.various_conditions.txt b/...cted_show_coverage.various_conditions.txt → ...cted_show_coverage.various_conditions.txt
diff --git a/...cted_show_coverage.while_early_return.txt → ...cted_show_coverage.while_early_return.txt b/...cted_show_coverage.while_early_return.txt → ...cted_show_coverage.while_early_return.txt
diff --git a/...overage-cov-reports-base/prettify_json.py → ...ps/coverage-reports-base/prettify_json.py b/...overage-cov-reports-base/prettify_json.py → ...ps/coverage-reports-base/prettify_json.py
diff --git a/...erage-cov-reports-link-dead-code/Makefile → ...lldeps/coverage-reports-deadcode/Makefile b/...erage-cov-reports-link-dead-code/Makefile → ...lldeps/coverage-reports-deadcode/Makefile
@@ -8,8 +8,8 @@
 # LINK_DEAD_CODE requires ignore-msvc due to Issue #76038
 LINK_DEAD_CODE=yes
 
--include ../instrument-coverage-cov-reports-base/Makefile
+-include ../coverage-reports-base/Makefile
 
 # ISSUE(76038): When targeting MSVC, Rust binaries built with both `-Z instrument-coverage` and
 # `-C link-dead-code` typically crash (with a seg-fault) or at best generate an empty `*.profraw`.
-# See ../instrument-coverage/coverage_tools.mk for more information.
+# See ../coverage/coverage_tools.mk for more information.
diff --git a/...ase/expected_export_coverage.closure.json → ...ode/expected_export_coverage.closure.json b/...ase/expected_export_coverage.closure.json → ...ode/expected_export_coverage.closure.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/closure.rs",
+          "filename": "../coverage/closure.rs",
           "summary": {
             "functions": {
               "count": 5,

diff --git a/.../expected_export_coverage.drop_trait.json → .../expected_export_coverage.drop_trait.json b/.../expected_export_coverage.drop_trait.json → .../expected_export_coverage.drop_trait.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/drop_trait.rs",
+          "filename": "../coverage/drop_trait.rs",
           "summary": {
             "functions": {
               "count": 2,

diff --git a/...se/expected_export_coverage.generics.json → ...de/expected_export_coverage.generics.json b/...se/expected_export_coverage.generics.json → ...de/expected_export_coverage.generics.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/generics.rs",
+          "filename": "../coverage/generics.rs",
           "summary": {
             "functions": {
               "count": 3,

diff --git a/...ead-code/expected_export_coverage.if.json → ...deadcode/expected_export_coverage.if.json b/...ead-code/expected_export_coverage.if.json → ...deadcode/expected_export_coverage.if.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if.rs",
+          "filename": "../coverage/if.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...ase/expected_export_coverage.if_else.json → ...ode/expected_export_coverage.if_else.json b/...ase/expected_export_coverage.if_else.json → ...ode/expected_export_coverage.if_else.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/if_else.rs",
+          "filename": "../coverage/if_else.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...expected_export_coverage.inner_items.json → ...expected_export_coverage.inner_items.json b/...expected_export_coverage.inner_items.json → ...expected_export_coverage.inner_items.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/inner_items.rs",
+          "filename": "../coverage/inner_items.rs",
           "summary": {
             "functions": {
               "count": 4,

diff --git a/...xpected_export_coverage.lazy_boolean.json → ...xpected_export_coverage.lazy_boolean.json b/...xpected_export_coverage.lazy_boolean.json → ...xpected_export_coverage.lazy_boolean.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/lazy_boolean.rs",
+          "filename": "../coverage/lazy_boolean.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...ted_export_coverage.loop_break_value.json → ...ted_export_coverage.loop_break_value.json b/...ted_export_coverage.loop_break_value.json → ...ted_export_coverage.loop_break_value.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/loop_break_value.rs",
+          "filename": "../coverage/loop_break_value.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...expected_export_coverage.simple_loop.json → ...expected_export_coverage.simple_loop.json b/...expected_export_coverage.simple_loop.json → ...expected_export_coverage.simple_loop.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_loop.rs",
+          "filename": "../coverage/simple_loop.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...xpected_export_coverage.simple_match.json → ...xpected_export_coverage.simple_match.json b/...xpected_export_coverage.simple_match.json → ...xpected_export_coverage.simple_match.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/simple_match.rs",
+          "filename": "../coverage/simple_match.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/..._coverage.question_mark_error_result.json → ...ted_export_coverage.try_error_result.json b/..._coverage.question_mark_error_result.json → ...ted_export_coverage.try_error_result.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/question_mark_error_result.rs",
+          "filename": "../coverage/try_error_result.rs",
           "summary": {
             "functions": {
               "count": 2,

diff --git a/...d_export_coverage.various_conditions.json → ...d_export_coverage.various_conditions.json b/...d_export_coverage.various_conditions.json → ...d_export_coverage.various_conditions.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/various_conditions.rs",
+          "filename": "../coverage/various_conditions.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...d_export_coverage.while_early_return.json → ...d_export_coverage.while_early_return.json b/...d_export_coverage.while_early_return.json → ...d_export_coverage.while_early_return.json
@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../instrument-coverage/while_early_return.rs",
+          "filename": "../coverage/while_early_return.rs",
           "summary": {
             "functions": {
               "count": 1,

diff --git a/...d-code/expected_show_coverage.closure.txt → ...adcode/expected_show_coverage.closure.txt b/...d-code/expected_show_coverage.closure.txt → ...adcode/expected_show_coverage.closure.txt
diff --git a/...ode/expected_show_coverage.drop_trait.txt → ...ode/expected_show_coverage.drop_trait.txt b/...ode/expected_show_coverage.drop_trait.txt → ...ode/expected_show_coverage.drop_trait.txt
diff --git a/...-code/expected_show_coverage.generics.txt → ...dcode/expected_show_coverage.generics.txt b/...-code/expected_show_coverage.generics.txt → ...dcode/expected_show_coverage.generics.txt
diff --git a/...k-dead-code/expected_show_coverage.if.txt → ...ts-deadcode/expected_show_coverage.if.txt b/...k-dead-code/expected_show_coverage.if.txt → ...ts-deadcode/expected_show_coverage.if.txt
diff --git a/...d-code/expected_show_coverage.if_else.txt → ...adcode/expected_show_coverage.if_else.txt b/...d-code/expected_show_coverage.if_else.txt → ...adcode/expected_show_coverage.if_else.txt