Merge #465

465: Re-organize GCC/Rust testsuites r=dkm a=tschwinge

... as discussed in
<https://gcc-rust.zulipchat.com/#narrow/stream/266897-general/topic/Testsuite.20results>:

> [...] best practice from what other GCC testsuites are doing), which I hope
> makes clearer the difference between the individual GCC/Rust testsuites:
> 'rust.test/compile' -> 'rust/compile/torture'
> 'rust.test/execute' -> 'rust/execute/torture'
> 'rust.test/unsupported' -> 'rust/compile/xfail'
> 'rust.test/xfail_compile' -> 'rust/compile'

... plus corresponding documentation updates in the '*.exp' files and
elsewhere.


Co-authored-by: Thomas Schwinge <thomas@codesourcery.com>

224 files changed, 21 insertions, 24 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c5ed565..6c132fc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,7 +12,7 @@ Here is a checklist to help you with your PR.
 - \[ ] Read contributing guidlines
 - \[ ] `make check-rust` passes locally
 - \[ ] Run `clang-format`
-- \[ ] Added any relevant test cases to gcc/testsuite/rust.test
+- \[ ] Added any relevant test cases to `gcc/testsuite/rust/`
 
 Note that you can skip the above if you are just opening a WIP PR in
 order to get feedback.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f4cdbf10..e412876 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,7 +35,7 @@
 
 * Avoid PR's with merge commit unless there's a good reason
 
-* Where possible please add test cases to gcc/testsuite/rust.test for all PRs. Some issues may not be testable via dejagnu/automation such as debug dump changes.
+* Where possible please add test cases to `gcc/testsuite/rust/` for all PRs. Some issues may not be testable via dejagnu/automation such as debug dump changes.
 
 * PR's cannot be merged untill clang format and the build and tests pass.
 
diff --git a/README.md b/README.md
index 81c4ba9..1e94101 100644
--- a/README.md
+++ b/README.md
@@ -76,33 +76,34 @@ export PATH=$HOME/gccrs-install/bin:$PATH
 
 ## Testsuite
 
-Invoke the full testsuite from the build directory (`gcc/gccrs-build` in the previous commands):
+Invoke the full testsuite from the build directory (`gccrs-build` in the previous commands):
 
 ```bash
 $ make check-rust
 ```
 
-Invoke a subset of the testsuite. For example, to only execute the tests that are expected to fail:
+Invoke a subset of the testsuite. For example, to only run tests that are currently known/expected to fail:
 
 ```bash
-$ make check-rust  RUNTESTFLAGS="xfail_compile.exp"
+$ make check-rust RUNTESTFLAGS="xfail.exp"
 ```
-The project currently has 3 sets of tests:
+There are the following sets of tests:
+- `compile.exp` : compilation tests
 - `execute.exp` : execution tests
-- `compile.exp` : compilation only tests, using combination of options
-- `xfail_compile.exp` : compilation only tests expected to fail
+- `xfail.exp` : tests that are currently known/expected to fail
 
 Invoke only a specific test :
 
 ```bash
-$ make check-rust  RUNTESTFLAGS="xfail_compile.exp=continue1.rs"
+$ make check-rust RUNTESTFLAGS="--all compile.exp=continue1.rs"
 ```
 
 Logs (with corresponding commands) can be found in : `gccrs-build/gcc/testsuite/rust/rust.log`.
 
 See [GCC Testing documentation](https://gcc.gnu.org/install/test.html) for more details.
 
-Test cases are located within [gcc/testsuite/rust.test](gcc/testsuite/rust.test) please feel free to contribute your specific
+Test cases are located within [`gcc/testsuite/rust/`](gcc/testsuite/rust/).
+Please contribute your specific
 test cases referencing any issues on Github.
 
 ## Debugging
@@ -152,28 +153,28 @@ If you want to build an object file:
 ```bash
 $ docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp \
     gccrs-dev:latest gccrs -g -O2 -c \
-    gcc/testsuite/rust.test/compilable/type_infer1.rs -o type_infer1.o
+    gcc/testsuite/rust/compile/torture/type_infer1.rs -o type_infer1.o
 ```
 
 If you want to build an executable file:
 ```bash
 $ docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp \
     gccrs-dev:latest gccrs -g -O2 \
-    gcc/testsuite/rust.test/compilable/type_infer1.rs -o type_infer1
+    gcc/testsuite/rust/compile/torture/type_infer1.rs -o type_infer1
 ```
 
 To emit assembly :
 ```bash
 $ docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp \
     gccrs-dev:latest gccrs -g -O2 \
-    gcc/testsuite/rust.test/compilable/type_infer1.rs -S -o type_infer1.s 
+    gcc/testsuite/rust/compile/torture/type_infer1.rs -S -o type_infer1.s 
 ```
 
 To emit the debug outputs you can add the option -frust-dump-all :
 ```bash
 $ docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp \
     gccrs-dev:latest gccrs -g -O2 \
-    gcc/testsuite/rust.test/compilable/type_infer1.rs -o type_infer1 -frust-dump-all
+    gcc/testsuite/rust/compile/torture/type_infer1.rs -o type_infer1 -frust-dump-all
 ```
 
 
diff --git a/gcc/testsuite/rust.test/xfail_compile/array_empty_list.rs b/gcc/testsuite/rust/compile/array_empty_list.rs
index 76e082a..76e082a 100644
--- a/gcc/testsuite/rust.test/xfail_compile/array_empty_list.rs
+++ b/gcc/testsuite/rust/compile/array_empty_list.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/arrays1.rs b/gcc/testsuite/rust/compile/arrays1.rs
index 714a6be..714a6be 100644
--- a/gcc/testsuite/rust.test/xfail_compile/arrays1.rs
+++ b/gcc/testsuite/rust/compile/arrays1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/arrays2.rs b/gcc/testsuite/rust/compile/arrays2.rs
index 9c788db..9c788db 100644
--- a/gcc/testsuite/rust.test/xfail_compile/arrays2.rs
+++ b/gcc/testsuite/rust/compile/arrays2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/bad_type1.rs b/gcc/testsuite/rust/compile/bad_type1.rs
index 93de439..93de439 100644
--- a/gcc/testsuite/rust.test/xfail_compile/bad_type1.rs
+++ b/gcc/testsuite/rust/compile/bad_type1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/bad_type2.rs b/gcc/testsuite/rust/compile/bad_type2.rs
index e47b8aa..e47b8aa 100644
--- a/gcc/testsuite/rust.test/xfail_compile/bad_type2.rs
+++ b/gcc/testsuite/rust/compile/bad_type2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/break1.rs b/gcc/testsuite/rust/compile/break1.rs
index 74f2809..74f2809 100644
--- a/gcc/testsuite/rust.test/xfail_compile/break1.rs
+++ b/gcc/testsuite/rust/compile/break1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/break2.rs b/gcc/testsuite/rust/compile/break2.rs
index 4279e70..4279e70 100644
--- a/gcc/testsuite/rust.test/xfail_compile/break2.rs
+++ b/gcc/testsuite/rust/compile/break2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/xfail_compile.exp b/gcc/testsuite/rust/compile/compile.exp
index 1936587..8162a73 100644
--- a/gcc/testsuite/rust.test/xfail_compile/xfail_compile.exp
+++ b/gcc/testsuite/rust/compile/compile.exp
@@ -14,10 +14,9 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
+# Compile tests, no torture testing.
 #
-# Rust test suite.
-# These tests are expected to raise an error in the frontend
-#
+# These tests raise errors in the front end; torture testing doesn't apply.
 
 # Load support procs.
 load_lib rust-dg.exp
diff --git a/gcc/testsuite/rust.test/xfail_compile/continue1.rs b/gcc/testsuite/rust/compile/continue1.rs
index 7d8e083..7d8e083 100644
--- a/gcc/testsuite/rust.test/xfail_compile/continue1.rs
+++ b/gcc/testsuite/rust/compile/continue1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/deadcode_err1.rs b/gcc/testsuite/rust/compile/deadcode_err1.rs
index 1dbe957..1dbe957 100644
--- a/gcc/testsuite/rust.test/xfail_compile/deadcode_err1.rs
+++ b/gcc/testsuite/rust/compile/deadcode_err1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/deadcode_err2.rs b/gcc/testsuite/rust/compile/deadcode_err2.rs
index 8c0eb46..8c0eb46 100644
--- a/gcc/testsuite/rust.test/xfail_compile/deadcode_err2.rs
+++ b/gcc/testsuite/rust/compile/deadcode_err2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/expected_type_args2.rs b/gcc/testsuite/rust/compile/expected_type_args2.rs
index 7945420..7945420 100644
--- a/gcc/testsuite/rust.test/xfail_compile/expected_type_args2.rs
+++ b/gcc/testsuite/rust/compile/expected_type_args2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/expected_type_args3.rs b/gcc/testsuite/rust/compile/expected_type_args3.rs
index ba07239..ba07239 100644
--- a/gcc/testsuite/rust.test/xfail_compile/expected_type_args3.rs
+++ b/gcc/testsuite/rust/compile/expected_type_args3.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/func1.rs b/gcc/testsuite/rust/compile/func1.rs
index 6758a38..6758a38 100644
--- a/gcc/testsuite/rust.test/xfail_compile/func1.rs
+++ b/gcc/testsuite/rust/compile/func1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/func2.rs b/gcc/testsuite/rust/compile/func2.rs
index 219bbfe..219bbfe 100644
--- a/gcc/testsuite/rust.test/xfail_compile/func2.rs
+++ b/gcc/testsuite/rust/compile/func2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/func3.rs b/gcc/testsuite/rust/compile/func3.rs
index 6cedf8e..6cedf8e 100644
--- a/gcc/testsuite/rust.test/xfail_compile/func3.rs
+++ b/gcc/testsuite/rust/compile/func3.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/func4.rs b/gcc/testsuite/rust/compile/func4.rs
index 3b2d2b0..3b2d2b0 100644
--- a/gcc/testsuite/rust.test/xfail_compile/func4.rs
+++ b/gcc/testsuite/rust/compile/func4.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/func5.rs b/gcc/testsuite/rust/compile/func5.rs
index 05624f5..05624f5 100644
--- a/gcc/testsuite/rust.test/xfail_compile/func5.rs
+++ b/gcc/testsuite/rust/compile/func5.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generic-default1.rs b/gcc/testsuite/rust/compile/generic-default1.rs
index 1b04f7d..1b04f7d 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generic-default1.rs
+++ b/gcc/testsuite/rust/compile/generic-default1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics1.rs b/gcc/testsuite/rust/compile/generics1.rs
index de1bbf5..de1bbf5 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics1.rs
+++ b/gcc/testsuite/rust/compile/generics1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics10.rs b/gcc/testsuite/rust/compile/generics10.rs
index a734fa8..a734fa8 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics10.rs
+++ b/gcc/testsuite/rust/compile/generics10.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics11.rs b/gcc/testsuite/rust/compile/generics11.rs
index 4d3b9e1..4d3b9e1 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics11.rs
+++ b/gcc/testsuite/rust/compile/generics11.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics12.rs b/gcc/testsuite/rust/compile/generics12.rs
index f1ac8b0..f1ac8b0 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics12.rs
+++ b/gcc/testsuite/rust/compile/generics12.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics2.rs b/gcc/testsuite/rust/compile/generics2.rs
index 5812b13..5812b13 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics2.rs
+++ b/gcc/testsuite/rust/compile/generics2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics3.rs b/gcc/testsuite/rust/compile/generics3.rs
index 2d42105..2d42105 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics3.rs
+++ b/gcc/testsuite/rust/compile/generics3.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics4.rs b/gcc/testsuite/rust/compile/generics4.rs
index a831836..a831836 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics4.rs
+++ b/gcc/testsuite/rust/compile/generics4.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics5.rs b/gcc/testsuite/rust/compile/generics5.rs
index e70afa8..e70afa8 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics5.rs
+++ b/gcc/testsuite/rust/compile/generics5.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics6.rs b/gcc/testsuite/rust/compile/generics6.rs
index 4cf45fd..4cf45fd 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics6.rs
+++ b/gcc/testsuite/rust/compile/generics6.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics7.rs b/gcc/testsuite/rust/compile/generics7.rs
index 78b6149..78b6149 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics7.rs
+++ b/gcc/testsuite/rust/compile/generics7.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics8.rs b/gcc/testsuite/rust/compile/generics8.rs
index 70bad1a..70bad1a 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics8.rs
+++ b/gcc/testsuite/rust/compile/generics8.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/generics9.rs b/gcc/testsuite/rust/compile/generics9.rs
index 3c5a244..3c5a244 100644
--- a/gcc/testsuite/rust.test/xfail_compile/generics9.rs
+++ b/gcc/testsuite/rust/compile/generics9.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/immutable1.rs b/gcc/testsuite/rust/compile/immutable1.rs
index d78c1b7..d78c1b7 100644
--- a/gcc/testsuite/rust.test/xfail_compile/immutable1.rs
+++ b/gcc/testsuite/rust/compile/immutable1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/immutable2.rs b/gcc/testsuite/rust/compile/immutable2.rs
index 86e70fe..86e70fe 100644
--- a/gcc/testsuite/rust.test/xfail_compile/immutable2.rs
+++ b/gcc/testsuite/rust/compile/immutable2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/immutable3.rs b/gcc/testsuite/rust/compile/immutable3.rs
index fb60280..fb60280 100644
--- a/gcc/testsuite/rust.test/xfail_compile/immutable3.rs
+++ b/gcc/testsuite/rust/compile/immutable3.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/immutable4.rs b/gcc/testsuite/rust/compile/immutable4.rs
index fb14554..fb14554 100644
--- a/gcc/testsuite/rust.test/xfail_compile/immutable4.rs
+++ b/gcc/testsuite/rust/compile/immutable4.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/immutable5.rs b/gcc/testsuite/rust/compile/immutable5.rs
index db23609..db23609 100644
--- a/gcc/testsuite/rust.test/xfail_compile/immutable5.rs
+++ b/gcc/testsuite/rust/compile/immutable5.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err1.rs b/gcc/testsuite/rust/compile/implicit_returns_err1.rs
index 973ba80..973ba80 100644
--- a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err1.rs
+++ b/gcc/testsuite/rust/compile/implicit_returns_err1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err2.rs b/gcc/testsuite/rust/compile/implicit_returns_err2.rs
index fb90748..fb90748 100644
--- a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err2.rs
+++ b/gcc/testsuite/rust/compile/implicit_returns_err2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err3.rs b/gcc/testsuite/rust/compile/implicit_returns_err3.rs
index 37b1c62..37b1c62 100644
--- a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err3.rs
+++ b/gcc/testsuite/rust/compile/implicit_returns_err3.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err4.rs b/gcc/testsuite/rust/compile/implicit_returns_err4.rs
index 59c6a02..59c6a02 100644
--- a/gcc/testsuite/rust.test/xfail_compile/implicit_returns_err4.rs
+++ b/gcc/testsuite/rust/compile/implicit_returns_err4.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/issue-407-2.rs b/gcc/testsuite/rust/compile/issue-407-2.rs
index e45fbde..e45fbde 100644
--- a/gcc/testsuite/rust.test/xfail_compile/issue-407-2.rs
+++ b/gcc/testsuite/rust/compile/issue-407-2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/issue-407.rs b/gcc/testsuite/rust/compile/issue-407.rs
index f51f7f9b..f51f7f9b 100644
--- a/gcc/testsuite/rust.test/xfail_compile/issue-407.rs
+++ b/gcc/testsuite/rust/compile/issue-407.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/method1.rs b/gcc/testsuite/rust/compile/method1.rs
index 51bc821..51bc821 100644
--- a/gcc/testsuite/rust.test/xfail_compile/method1.rs
+++ b/gcc/testsuite/rust/compile/method1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/method2.rs b/gcc/testsuite/rust/compile/method2.rs
index be43b1a..be43b1a 100644
--- a/gcc/testsuite/rust.test/xfail_compile/method2.rs
+++ b/gcc/testsuite/rust/compile/method2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/missing_return1.rs b/gcc/testsuite/rust/compile/missing_return1.rs
index 00bf393..00bf393 100644
--- a/gcc/testsuite/rust.test/xfail_compile/missing_return1.rs
+++ b/gcc/testsuite/rust/compile/missing_return1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/never_type_err1.rs b/gcc/testsuite/rust/compile/never_type_err1.rs
index 52b1283..52b1283 100644
--- a/gcc/testsuite/rust.test/xfail_compile/never_type_err1.rs
+++ b/gcc/testsuite/rust/compile/never_type_err1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/never_type_err2.rs b/gcc/testsuite/rust/compile/never_type_err2.rs
index c94cb82..c94cb82 100644
--- a/gcc/testsuite/rust.test/xfail_compile/never_type_err2.rs
+++ b/gcc/testsuite/rust/compile/never_type_err2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/raw_identifiers_bad_keywords.rs b/gcc/testsuite/rust/compile/raw_identifiers_bad_keywords.rs
index 854d7e6..854d7e6 100644
--- a/gcc/testsuite/rust.test/xfail_compile/raw_identifiers_bad_keywords.rs
+++ b/gcc/testsuite/rust/compile/raw_identifiers_bad_keywords.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/raw_identifiers_underscore.rs b/gcc/testsuite/rust/compile/raw_identifiers_underscore.rs
index 86e9013..86e9013 100644
--- a/gcc/testsuite/rust.test/xfail_compile/raw_identifiers_underscore.rs
+++ b/gcc/testsuite/rust/compile/raw_identifiers_underscore.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error1.rs b/gcc/testsuite/rust/compile/redef_error1.rs
index ae51e36..ae51e36 100644
--- a/gcc/testsuite/rust.test/xfail_compile/redef_error1.rs
+++ b/gcc/testsuite/rust/compile/redef_error1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error2.rs b/gcc/testsuite/rust/compile/redef_error2.rs
index 65793bc..65793bc 100644
--- a/gcc/testsuite/rust.test/xfail_compile/redef_error2.rs
+++ b/gcc/testsuite/rust/compile/redef_error2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error3.rs b/gcc/testsuite/rust/compile/redef_error3.rs
index a4bf1ed..a4bf1ed 100644
--- a/gcc/testsuite/rust.test/xfail_compile/redef_error3.rs
+++ b/gcc/testsuite/rust/compile/redef_error3.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error4.rs b/gcc/testsuite/rust/compile/redef_error4.rs
index a250c0a..a250c0a 100644
--- a/gcc/testsuite/rust.test/xfail_compile/redef_error4.rs
+++ b/gcc/testsuite/rust/compile/redef_error4.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error5.rs b/gcc/testsuite/rust/compile/redef_error5.rs
index dc6ad50..dc6ad50 100644
--- a/gcc/testsuite/rust.test/xfail_compile/redef_error5.rs
+++ b/gcc/testsuite/rust/compile/redef_error5.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/redef_error6.rs b/gcc/testsuite/rust/compile/redef_error6.rs
index 664c6ae..664c6ae 100644
--- a/gcc/testsuite/rust.test/xfail_compile/redef_error6.rs
+++ b/gcc/testsuite/rust/compile/redef_error6.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/shadow1.rs b/gcc/testsuite/rust/compile/shadow1.rs
index 35779bb..35779bb 100644
--- a/gcc/testsuite/rust.test/xfail_compile/shadow1.rs
+++ b/gcc/testsuite/rust/compile/shadow1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/static_var1.rs b/gcc/testsuite/rust/compile/static_var1.rs
index b3b5751..b3b5751 100644
--- a/gcc/testsuite/rust.test/xfail_compile/static_var1.rs
+++ b/gcc/testsuite/rust/compile/static_var1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/stmt_with_block_err1.rs b/gcc/testsuite/rust/compile/stmt_with_block_err1.rs
index 8780d0f..8780d0f 100644
--- a/gcc/testsuite/rust.test/xfail_compile/stmt_with_block_err1.rs
+++ b/gcc/testsuite/rust/compile/stmt_with_block_err1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/struct_init1.rs b/gcc/testsuite/rust/compile/struct_init1.rs
index 0554f29..0554f29 100644
--- a/gcc/testsuite/rust.test/xfail_compile/struct_init1.rs
+++ b/gcc/testsuite/rust/compile/struct_init1.rs
diff --git a/gcc/testsuite/rust.test/compile/arithmetic_expressions1.rs b/gcc/testsuite/rust/compile/torture/arithmetic_expressions1.rs
index 4c3ee77..4c3ee77 100644
--- a/gcc/testsuite/rust.test/compile/arithmetic_expressions1.rs
+++ b/gcc/testsuite/rust/compile/torture/arithmetic_expressions1.rs
diff --git a/gcc/testsuite/rust.test/compile/array_type_infer.rs b/gcc/testsuite/rust/compile/torture/array_type_infer.rs
index 6f21bf2..6f21bf2 100644
--- a/gcc/testsuite/rust.test/compile/array_type_infer.rs
+++ b/gcc/testsuite/rust/compile/torture/array_type_infer.rs
diff --git a/gcc/testsuite/rust.test/compile/array_zero_length.rs b/gcc/testsuite/rust/compile/torture/array_zero_length.rs
index 3155b1c..3155b1c 100644
--- a/gcc/testsuite/rust.test/compile/array_zero_length.rs
+++ b/gcc/testsuite/rust/compile/torture/array_zero_length.rs
diff --git a/gcc/testsuite/rust.test/compile/arrays1.rs b/gcc/testsuite/rust/compile/torture/arrays1.rs
index 7250e0f..7250e0f 100644
--- a/gcc/testsuite/rust.test/compile/arrays1.rs
+++ b/gcc/testsuite/rust/compile/torture/arrays1.rs
diff --git a/gcc/testsuite/rust.test/compile/arrays2.rs b/gcc/testsuite/rust/compile/torture/arrays2.rs
index 55491f3..55491f3 100644
--- a/gcc/testsuite/rust.test/compile/arrays2.rs
+++ b/gcc/testsuite/rust/compile/torture/arrays2.rs
diff --git a/gcc/testsuite/rust.test/compile/arrays3.rs b/gcc/testsuite/rust/compile/torture/arrays3.rs
index 372d969..372d969 100644
--- a/gcc/testsuite/rust.test/compile/arrays3.rs
+++ b/gcc/testsuite/rust/compile/torture/arrays3.rs
diff --git a/gcc/testsuite/rust.test/compile/arrays4.rs b/gcc/testsuite/rust/compile/torture/arrays4.rs
index ac317fe..ac317fe 100644
--- a/gcc/testsuite/rust.test/compile/arrays4.rs
+++ b/gcc/testsuite/rust/compile/torture/arrays4.rs
diff --git a/gcc/testsuite/rust.test/compile/arrays_index1.rs b/gcc/testsuite/rust/compile/torture/arrays_index1.rs
index 1fe5de9..1fe5de9 100644
--- a/gcc/testsuite/rust.test/compile/arrays_index1.rs
+++ b/gcc/testsuite/rust/compile/torture/arrays_index1.rs
diff --git a/gcc/testsuite/rust.test/compile/arrays_index2.rs b/gcc/testsuite/rust/compile/torture/arrays_index2.rs
index f9bee77..f9bee77 100644
--- a/gcc/testsuite/rust.test/compile/arrays_index2.rs
+++ b/gcc/testsuite/rust/compile/torture/arrays_index2.rs
diff --git a/gcc/testsuite/rust.test/compile/block_expr1.rs b/gcc/testsuite/rust/compile/torture/block_expr1.rs
index 011cc1f..011cc1f 100644
--- a/gcc/testsuite/rust.test/compile/block_expr1.rs
+++ b/gcc/testsuite/rust/compile/torture/block_expr1.rs
diff --git a/gcc/testsuite/rust.test/compile/block_expr2.rs b/gcc/testsuite/rust/compile/torture/block_expr2.rs
index 7c3ff69..7c3ff69 100644
--- a/gcc/testsuite/rust.test/compile/block_expr2.rs
+++ b/gcc/testsuite/rust/compile/torture/block_expr2.rs
diff --git a/gcc/testsuite/rust.test/compile/block_expr3.rs b/gcc/testsuite/rust/compile/torture/block_expr3.rs
index 6914b63..6914b63 100644
--- a/gcc/testsuite/rust.test/compile/block_expr3.rs
+++ b/gcc/testsuite/rust/compile/torture/block_expr3.rs
diff --git a/gcc/testsuite/rust.test/compile/block_expr4.rs b/gcc/testsuite/rust/compile/torture/block_expr4.rs
index da033ef..da033ef 100644
--- a/gcc/testsuite/rust.test/compile/block_expr4.rs
+++ b/gcc/testsuite/rust/compile/torture/block_expr4.rs
diff --git a/gcc/testsuite/rust.test/compile/block_expr5.rs b/gcc/testsuite/rust/compile/torture/block_expr5.rs
index 7e164a9..7e164a9 100644
--- a/gcc/testsuite/rust.test/compile/block_expr5.rs
+++ b/gcc/testsuite/rust/compile/torture/block_expr5.rs
diff --git a/gcc/testsuite/rust.test/compile/block_expr_parser_bug.rs b/gcc/testsuite/rust/compile/torture/block_expr_parser_bug.rs
index 468aace..468aace 100644
--- a/gcc/testsuite/rust.test/compile/block_expr_parser_bug.rs
+++ b/gcc/testsuite/rust/compile/torture/block_expr_parser_bug.rs
diff --git a/gcc/testsuite/rust.test/compile/borrow1.rs b/gcc/testsuite/rust/compile/torture/borrow1.rs
index 8afa474..8afa474 100644
--- a/gcc/testsuite/rust.test/compile/borrow1.rs
+++ b/gcc/testsuite/rust/compile/torture/borrow1.rs
diff --git a/gcc/testsuite/rust.test/compile/cfg_attr.rs b/gcc/testsuite/rust/compile/torture/cfg_attr.rs
index 1915f34..1915f34 100644
--- a/gcc/testsuite/rust.test/compile/cfg_attr.rs
+++ b/gcc/testsuite/rust/compile/torture/cfg_attr.rs
diff --git a/gcc/testsuite/rust.test/compile/char1.rs b/gcc/testsuite/rust/compile/torture/char1.rs
index 73835c2..73835c2 100644
--- a/gcc/testsuite/rust.test/compile/char1.rs
+++ b/gcc/testsuite/rust/compile/torture/char1.rs
diff --git a/gcc/testsuite/rust.test/compile/comparison_expr1.rs b/gcc/testsuite/rust/compile/torture/comparison_expr1.rs
index ed71ec8..ed71ec8 100644
--- a/gcc/testsuite/rust.test/compile/comparison_expr1.rs
+++ b/gcc/testsuite/rust/compile/torture/comparison_expr1.rs
diff --git a/gcc/testsuite/rust.test/compile/compile.exp b/gcc/testsuite/rust/compile/torture/compile.exp
index 7c92d7a..9daa7fc 100644
--- a/gcc/testsuite/rust.test/compile/compile.exp
+++ b/gcc/testsuite/rust/compile/torture/compile.exp
@@ -14,9 +14,7 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-#
-# Rust torture test suite.
-#
+# Compile tests, torture testing.
 
 # Load support procs.
 load_lib rust-dg.exp
diff --git a/gcc/testsuite/rust.test/compile/compound_assignment_expr1.rs b/gcc/testsuite/rust/compile/torture/compound_assignment_expr1.rs
index 1ff0d24..1ff0d24 100644
--- a/gcc/testsuite/rust.test/compile/compound_assignment_expr1.rs
+++ b/gcc/testsuite/rust/compile/torture/compound_assignment_expr1.rs
diff --git a/gcc/testsuite/rust.test/compile/conditional.rs b/gcc/testsuite/rust/compile/torture/conditional.rs
index 2bb3a95..2bb3a95 100644
--- a/gcc/testsuite/rust.test/compile/conditional.rs
+++ b/gcc/testsuite/rust/compile/torture/conditional.rs
diff --git a/gcc/testsuite/rust.test/compile/constant1.rs b/gcc/testsuite/rust/compile/torture/constant1.rs
index 57bcb0b..57bcb0b 100644
--- a/gcc/testsuite/rust.test/compile/constant1.rs
+++ b/gcc/testsuite/rust/compile/torture/constant1.rs
diff --git a/gcc/testsuite/rust.test/compile/deadcode1.rs b/gcc/testsuite/rust/compile/torture/deadcode1.rs
index 1ba646f..1ba646f 100644
--- a/gcc/testsuite/rust.test/compile/deadcode1.rs
+++ b/gcc/testsuite/rust/compile/torture/deadcode1.rs
diff --git a/gcc/testsuite/rust.test/compile/deadcode2.rs b/gcc/testsuite/rust/compile/torture/deadcode2.rs
index ba7d5f0..ba7d5f0 100644
--- a/gcc/testsuite/rust.test/compile/deadcode2.rs
+++ b/gcc/testsuite/rust/compile/torture/deadcode2.rs
diff --git a/gcc/testsuite/rust.test/compile/deref1.rs b/gcc/testsuite/rust/compile/torture/deref1.rs
index d715ce9..d715ce9 100644
--- a/gcc/testsuite/rust.test/compile/deref1.rs
+++ b/gcc/testsuite/rust/compile/torture/deref1.rs
diff --git a/gcc/testsuite/rust.test/compile/float1.rs b/gcc/testsuite/rust/compile/torture/float1.rs
index fbe8938..fbe8938 100644
--- a/gcc/testsuite/rust.test/compile/float1.rs
+++ b/gcc/testsuite/rust/compile/torture/float1.rs
diff --git a/gcc/testsuite/rust.test/compile/float_types.rs b/gcc/testsuite/rust/compile/torture/float_types.rs
index 7d3d298..7d3d298 100644
--- a/gcc/testsuite/rust.test/compile/float_types.rs
+++ b/gcc/testsuite/rust/compile/torture/float_types.rs
diff --git a/gcc/testsuite/rust.test/compile/forward_decl_1.rs b/gcc/testsuite/rust/compile/torture/forward_decl_1.rs
index b8403f9..b8403f9 100644
--- a/gcc/testsuite/rust.test/compile/forward_decl_1.rs
+++ b/gcc/testsuite/rust/compile/torture/forward_decl_1.rs
diff --git a/gcc/testsuite/rust.test/compile/forward_decl_2.rs b/gcc/testsuite/rust/compile/torture/forward_decl_2.rs
index efc3b0d..efc3b0d 100644
--- a/gcc/testsuite/rust.test/compile/forward_decl_2.rs
+++ b/gcc/testsuite/rust/compile/torture/forward_decl_2.rs
diff --git a/gcc/testsuite/rust.test/compile/forward_decl_3.rs b/gcc/testsuite/rust/compile/torture/forward_decl_3.rs
index 0028ca5..0028ca5 100644
--- a/gcc/testsuite/rust.test/compile/forward_decl_3.rs
+++ b/gcc/testsuite/rust/compile/torture/forward_decl_3.rs
diff --git a/gcc/testsuite/rust.test/compile/forward_decl_4.rs b/gcc/testsuite/rust/compile/torture/forward_decl_4.rs
index e1fe51f..e1fe51f 100644
--- a/gcc/testsuite/rust.test/compile/forward_decl_4.rs
+++ b/gcc/testsuite/rust/compile/torture/forward_decl_4.rs
diff --git a/gcc/testsuite/rust.test/compile/func1.rs b/gcc/testsuite/rust/compile/torture/func1.rs
index df1789e..df1789e 100644
--- a/gcc/testsuite/rust.test/compile/func1.rs
+++ b/gcc/testsuite/rust/compile/torture/func1.rs
diff --git a/gcc/testsuite/rust.test/compile/func2.rs b/gcc/testsuite/rust/compile/torture/func2.rs
index f7dd556..f7dd556 100644
--- a/gcc/testsuite/rust.test/compile/func2.rs
+++ b/gcc/testsuite/rust/compile/torture/func2.rs
diff --git a/gcc/testsuite/rust.test/compile/function_reference1.rs b/gcc/testsuite/rust/compile/torture/function_reference1.rs
index dfbd01b..dfbd01b 100644
--- a/gcc/testsuite/rust.test/compile/function_reference1.rs
+++ b/gcc/testsuite/rust/compile/torture/function_reference1.rs
diff --git a/gcc/testsuite/rust.test/compile/function_reference2.rs b/gcc/testsuite/rust/compile/torture/function_reference2.rs
index 3c3e7c1..3c3e7c1 100644
--- a/gcc/testsuite/rust.test/compile/function_reference2.rs
+++ b/gcc/testsuite/rust/compile/torture/function_reference2.rs
diff --git a/gcc/testsuite/rust.test/compile/function_reference3.rs b/gcc/testsuite/rust/compile/torture/function_reference3.rs
index 0cb3181..0cb3181 100644
--- a/gcc/testsuite/rust.test/compile/function_reference3.rs
+++ b/gcc/testsuite/rust/compile/torture/function_reference3.rs
diff --git a/gcc/testsuite/rust.test/compile/function_reference4.rs b/gcc/testsuite/rust/compile/torture/function_reference4.rs
index 977e4c9..977e4c9 100644
--- a/gcc/testsuite/rust.test/compile/function_reference4.rs
+++ b/gcc/testsuite/rust/compile/torture/function_reference4.rs
diff --git a/gcc/testsuite/rust.test/compile/generics1.rs b/gcc/testsuite/rust/compile/torture/generics1.rs
index 87bcdc8..87bcdc8 100644
--- a/gcc/testsuite/rust.test/compile/generics1.rs
+++ b/gcc/testsuite/rust/compile/torture/generics1.rs
diff --git a/gcc/testsuite/rust.test/compile/generics10.rs b/gcc/testsuite/rust/compile/torture/generics10.rs
index 9526149..9526149 100644
--- a/gcc/testsuite/rust.test/compile/generics10.rs
+++ b/gcc/testsuite/rust/compile/torture/generics10.rs
diff --git a/gcc/testsuite/rust.test/compile/generics11.rs b/gcc/testsuite/rust/compile/torture/generics11.rs
index 3c8f5ba..3c8f5ba 100644
--- a/gcc/testsuite/rust.test/compile/generics11.rs
+++ b/gcc/testsuite/rust/compile/torture/generics11.rs
diff --git a/gcc/testsuite/rust.test/compile/generics12.rs b/gcc/testsuite/rust/compile/torture/generics12.rs
index f31be58..f31be58 100644
--- a/gcc/testsuite/rust.test/compile/generics12.rs
+++ b/gcc/testsuite/rust/compile/torture/generics12.rs
diff --git a/gcc/testsuite/rust.test/compile/generics13.rs b/gcc/testsuite/rust/compile/torture/generics13.rs
index 5c8795d..5c8795d 100644
--- a/gcc/testsuite/rust.test/compile/generics13.rs
+++ b/gcc/testsuite/rust/compile/torture/generics13.rs
diff --git a/gcc/testsuite/rust.test/compile/generics14.rs b/gcc/testsuite/rust/compile/torture/generics14.rs
index aa8fbf2..aa8fbf2 100644
--- a/gcc/testsuite/rust.test/compile/generics14.rs
+++ b/gcc/testsuite/rust/compile/torture/generics14.rs
diff --git a/gcc/testsuite/rust.test/compile/generics15.rs b/gcc/testsuite/rust/compile/torture/generics15.rs
index c16a67c..c16a67c 100644
--- a/gcc/testsuite/rust.test/compile/generics15.rs
+++ b/gcc/testsuite/rust/compile/torture/generics15.rs
diff --git a/gcc/testsuite/rust.test/compile/generics16.rs b/gcc/testsuite/rust/compile/torture/generics16.rs
index 15b9d7b..15b9d7b 100644
--- a/gcc/testsuite/rust.test/compile/generics16.rs
+++ b/gcc/testsuite/rust/compile/torture/generics16.rs
diff --git a/gcc/testsuite/rust.test/compile/generics17.rs b/gcc/testsuite/rust/compile/torture/generics17.rs
index d523149..d523149 100644
--- a/gcc/testsuite/rust.test/compile/generics17.rs
+++ b/gcc/testsuite/rust/compile/torture/generics17.rs
diff --git a/gcc/testsuite/rust.test/compile/generics18.rs b/gcc/testsuite/rust/compile/torture/generics18.rs
index 904cb9a..904cb9a 100644
--- a/gcc/testsuite/rust.test/compile/generics18.rs
+++ b/gcc/testsuite/rust/compile/torture/generics18.rs
diff --git a/gcc/testsuite/rust.test/compile/generics19.rs b/gcc/testsuite/rust/compile/torture/generics19.rs
index 9a5b4cb..9a5b4cb 100644
--- a/gcc/testsuite/rust.test/compile/generics19.rs
+++ b/gcc/testsuite/rust/compile/torture/generics19.rs
diff --git a/gcc/testsuite/rust.test/compile/generics2.rs b/gcc/testsuite/rust/compile/torture/generics2.rs
index da0ab99..da0ab99 100644
--- a/gcc/testsuite/rust.test/compile/generics2.rs
+++ b/gcc/testsuite/rust/compile/torture/generics2.rs
diff --git a/gcc/testsuite/rust.test/compile/generics20.rs b/gcc/testsuite/rust/compile/torture/generics20.rs
index 8fe1cff..8fe1cff 100644
--- a/gcc/testsuite/rust.test/compile/generics20.rs
+++ b/gcc/testsuite/rust/compile/torture/generics20.rs
diff --git a/gcc/testsuite/rust.test/compile/generics21.rs b/gcc/testsuite/rust/compile/torture/generics21.rs
index dc4e935..dc4e935 100644
--- a/gcc/testsuite/rust.test/compile/generics21.rs
+++ b/gcc/testsuite/rust/compile/torture/generics21.rs
diff --git a/gcc/testsuite/rust.test/compile/generics22.rs b/gcc/testsuite/rust/compile/torture/generics22.rs
index 465ebb0..465ebb0 100644
--- a/gcc/testsuite/rust.test/compile/generics22.rs
+++ b/gcc/testsuite/rust/compile/torture/generics22.rs
diff --git a/gcc/testsuite/rust.test/compile/generics23.rs b/gcc/testsuite/rust/compile/torture/generics23.rs
index 2169e36..2169e36 100644
--- a/gcc/testsuite/rust.test/compile/generics23.rs
+++ b/gcc/testsuite/rust/compile/torture/generics23.rs
diff --git a/gcc/testsuite/rust.test/compile/generics24.rs b/gcc/testsuite/rust/compile/torture/generics24.rs
index 9d24bce..9d24bce 100644
--- a/gcc/testsuite/rust.test/compile/generics24.rs
+++ b/gcc/testsuite/rust/compile/torture/generics24.rs
diff --git a/gcc/testsuite/rust.test/compile/generics25.rs b/gcc/testsuite/rust/compile/torture/generics25.rs
index e7792e3..e7792e3 100644
--- a/gcc/testsuite/rust.test/compile/generics25.rs
+++ b/gcc/testsuite/rust/compile/torture/generics25.rs
diff --git a/gcc/testsuite/rust.test/compile/generics26.rs b/gcc/testsuite/rust/compile/torture/generics26.rs
index 522e16f..522e16f 100644
--- a/gcc/testsuite/rust.test/compile/generics26.rs
+++ b/gcc/testsuite/rust/compile/torture/generics26.rs
diff --git a/gcc/testsuite/rust.test/compile/generics27.rs b/gcc/testsuite/rust/compile/torture/generics27.rs
index 9871638..9871638 100644
--- a/gcc/testsuite/rust.test/compile/generics27.rs
+++ b/gcc/testsuite/rust/compile/torture/generics27.rs
diff --git a/gcc/testsuite/rust.test/compile/generics28.rs b/gcc/testsuite/rust/compile/torture/generics28.rs
index 8cee8b0..8cee8b0 100644
--- a/gcc/testsuite/rust.test/compile/generics28.rs
+++ b/gcc/testsuite/rust/compile/torture/generics28.rs
diff --git a/gcc/testsuite/rust.test/compile/generics29.rs b/gcc/testsuite/rust/compile/torture/generics29.rs
index e09a104..e09a104 100644
--- a/gcc/testsuite/rust.test/compile/generics29.rs
+++ b/gcc/testsuite/rust/compile/torture/generics29.rs
diff --git a/gcc/testsuite/rust.test/compile/generics3.rs b/gcc/testsuite/rust/compile/torture/generics3.rs
index ceec8f7..ceec8f7 100644
--- a/gcc/testsuite/rust.test/compile/generics3.rs
+++ b/gcc/testsuite/rust/compile/torture/generics3.rs
diff --git a/gcc/testsuite/rust.test/compile/generics30.rs b/gcc/testsuite/rust/compile/torture/generics30.rs
index 229f6d1..229f6d1 100644
--- a/gcc/testsuite/rust.test/compile/generics30.rs
+++ b/gcc/testsuite/rust/compile/torture/generics30.rs
diff --git a/gcc/testsuite/rust.test/compile/generics31.rs b/gcc/testsuite/rust/compile/torture/generics31.rs
index 68ad4bf..68ad4bf 100644
--- a/gcc/testsuite/rust.test/compile/generics31.rs
+++ b/gcc/testsuite/rust/compile/torture/generics31.rs
diff --git a/gcc/testsuite/rust.test/compile/generics32.rs b/gcc/testsuite/rust/compile/torture/generics32.rs
index 21b9cae..21b9cae 100644
--- a/gcc/testsuite/rust.test/compile/generics32.rs
+++ b/gcc/testsuite/rust/compile/torture/generics32.rs
diff --git a/gcc/testsuite/rust.test/compile/generics4.rs b/gcc/testsuite/rust/compile/torture/generics4.rs
index 3ae3861..3ae3861 100644
--- a/gcc/testsuite/rust.test/compile/generics4.rs
+++ b/gcc/testsuite/rust/compile/torture/generics4.rs
diff --git a/gcc/testsuite/rust.test/compile/generics5.rs b/gcc/testsuite/rust/compile/torture/generics5.rs
index b7f4302..b7f4302 100644
--- a/gcc/testsuite/rust.test/compile/generics5.rs
+++ b/gcc/testsuite/rust/compile/torture/generics5.rs
diff --git a/gcc/testsuite/rust.test/compile/generics6.rs b/gcc/testsuite/rust/compile/torture/generics6.rs
index 283a118..283a118 100644
--- a/gcc/testsuite/rust.test/compile/generics6.rs
+++ b/gcc/testsuite/rust/compile/torture/generics6.rs
diff --git a/gcc/testsuite/rust.test/compile/generics7.rs b/gcc/testsuite/rust/compile/torture/generics7.rs
index 2e89ce1..2e89ce1 100644
--- a/gcc/testsuite/rust.test/compile/generics7.rs
+++ b/gcc/testsuite/rust/compile/torture/generics7.rs
diff --git a/gcc/testsuite/rust.test/compile/generics8.rs b/gcc/testsuite/rust/compile/torture/generics8.rs
index 036d855..036d855 100644
--- a/gcc/testsuite/rust.test/compile/generics8.rs
+++ b/gcc/testsuite/rust/compile/torture/generics8.rs
diff --git a/gcc/testsuite/rust.test/compile/generics9.rs b/gcc/testsuite/rust/compile/torture/generics9.rs
index 307c34f..307c34f 100644
--- a/gcc/testsuite/rust.test/compile/generics9.rs
+++ b/gcc/testsuite/rust/compile/torture/generics9.rs
diff --git a/gcc/testsuite/rust.test/compile/if_elif_else_expr1.rs b/gcc/testsuite/rust/compile/torture/if_elif_else_expr1.rs
index 65ed7f7..65ed7f7 100644
--- a/gcc/testsuite/rust.test/compile/if_elif_else_expr1.rs
+++ b/gcc/testsuite/rust/compile/torture/if_elif_else_expr1.rs
diff --git a/gcc/testsuite/rust.test/compile/impl_block1.rs b/gcc/testsuite/rust/compile/torture/impl_block1.rs
index d67afa1..d67afa1 100644
--- a/gcc/testsuite/rust.test/compile/impl_block1.rs
+++ b/gcc/testsuite/rust/compile/torture/impl_block1.rs
diff --git a/gcc/testsuite/rust.test/compile/impl_block2.rs b/gcc/testsuite/rust/compile/torture/impl_block2.rs
index 0ed592d..0ed592d 100644
--- a/gcc/testsuite/rust.test/compile/impl_block2.rs
+++ b/gcc/testsuite/rust/compile/torture/impl_block2.rs
diff --git a/gcc/testsuite/rust.test/compile/impl_block3.rs b/gcc/testsuite/rust/compile/torture/impl_block3.rs
index 78ec459..78ec459 100644
--- a/gcc/testsuite/rust.test/compile/impl_block3.rs
+++ b/gcc/testsuite/rust/compile/torture/impl_block3.rs
diff --git a/gcc/testsuite/rust.test/compile/implicit_returns1.rs b/gcc/testsuite/rust/compile/torture/implicit_returns1.rs
index 54cc8b3..54cc8b3 100644
--- a/gcc/testsuite/rust.test/compile/implicit_returns1.rs
+++ b/gcc/testsuite/rust/compile/torture/implicit_returns1.rs
diff --git a/gcc/testsuite/rust.test/compile/infer_type1.rs b/gcc/testsuite/rust/compile/torture/infer_type1.rs
index aabfcef..aabfcef 100644
--- a/gcc/testsuite/rust.test/compile/infer_type1.rs
+++ b/gcc/testsuite/rust/compile/torture/infer_type1.rs
diff --git a/gcc/testsuite/rust.test/compile/integer_inference_var1.rs b/gcc/testsuite/rust/compile/torture/integer_inference_var1.rs
index ccee06a..ccee06a 100644
--- a/gcc/testsuite/rust.test/compile/integer_inference_var1.rs
+++ b/gcc/testsuite/rust/compile/torture/integer_inference_var1.rs
diff --git a/gcc/testsuite/rust.test/compile/integer_inference_var2.rs b/gcc/testsuite/rust/compile/torture/integer_inference_var2.rs
index 2209e93..2209e93 100644
--- a/gcc/testsuite/rust.test/compile/integer_inference_var2.rs
+++ b/gcc/testsuite/rust/compile/torture/integer_inference_var2.rs
diff --git a/gcc/testsuite/rust.test/compile/integer_inference_var3.rs b/gcc/testsuite/rust/compile/torture/integer_inference_var3.rs
index 582ae77..582ae77 100644
--- a/gcc/testsuite/rust.test/compile/integer_inference_var3.rs
+++ b/gcc/testsuite/rust/compile/torture/integer_inference_var3.rs
diff --git a/gcc/testsuite/rust.test/compile/integer_inference_var4.rs b/gcc/testsuite/rust/compile/torture/integer_inference_var4.rs
index 136d818..136d818 100644
--- a/gcc/testsuite/rust.test/compile/integer_inference_var4.rs
+++ b/gcc/testsuite/rust/compile/torture/integer_inference_var4.rs
diff --git a/gcc/testsuite/rust.test/compile/integer_inference_var5.rs b/gcc/testsuite/rust/compile/torture/integer_inference_var5.rs
index 051de1d..051de1d 100644
--- a/gcc/testsuite/rust.test/compile/integer_inference_var5.rs
+++ b/gcc/testsuite/rust/compile/torture/integer_inference_var5.rs
diff --git a/gcc/testsuite/rust.test/compile/integer_types.rs b/gcc/testsuite/rust/compile/torture/integer_types.rs
index 95a7378..95a7378 100644
--- a/gcc/testsuite/rust.test/compile/integer_types.rs
+++ b/gcc/testsuite/rust/compile/torture/integer_types.rs
diff --git a/gcc/testsuite/rust.test/compile/lifetime1.rs b/gcc/testsuite/rust/compile/torture/lifetime1.rs
index 151fd82..151fd82 100644
--- a/gcc/testsuite/rust.test/compile/lifetime1.rs
+++ b/gcc/testsuite/rust/compile/torture/lifetime1.rs
diff --git a/gcc/testsuite/rust.test/compile/literals1.rs b/gcc/testsuite/rust/compile/torture/literals1.rs
index cf021e2..cf021e2 100644
--- a/gcc/testsuite/rust.test/compile/literals1.rs
+++ b/gcc/testsuite/rust/compile/torture/literals1.rs
diff --git a/gcc/testsuite/rust.test/compile/loop1.rs b/gcc/testsuite/rust/compile/torture/loop1.rs
index a8ee2f5..a8ee2f5 100644
--- a/gcc/testsuite/rust.test/compile/loop1.rs
+++ b/gcc/testsuite/rust/compile/torture/loop1.rs
diff --git a/gcc/testsuite/rust.test/compile/loop2.rs b/gcc/testsuite/rust/compile/torture/loop2.rs
index 3de3ea8..3de3ea8 100644
--- a/gcc/testsuite/rust.test/compile/loop2.rs
+++ b/gcc/testsuite/rust/compile/torture/loop2.rs
diff --git a/gcc/testsuite/rust.test/compile/loop3.rs b/gcc/testsuite/rust/compile/torture/loop3.rs
index 76fadfb..76fadfb 100644
--- a/gcc/testsuite/rust.test/compile/loop3.rs
+++ b/gcc/testsuite/rust/compile/torture/loop3.rs
diff --git a/gcc/testsuite/rust.test/compile/loop4.rs b/gcc/testsuite/rust/compile/torture/loop4.rs
index f7b5935..f7b5935 100644
--- a/gcc/testsuite/rust.test/compile/loop4.rs
+++ b/gcc/testsuite/rust/compile/torture/loop4.rs
diff --git a/gcc/testsuite/rust.test/compile/loop5.rs b/gcc/testsuite/rust/compile/torture/loop5.rs
index 4004cd3..4004cd3 100644
--- a/gcc/testsuite/rust.test/compile/loop5.rs
+++ b/gcc/testsuite/rust/compile/torture/loop5.rs
diff --git a/gcc/testsuite/rust.test/compile/loop6.rs b/gcc/testsuite/rust/compile/torture/loop6.rs
index ecd3ad4..ecd3ad4 100644
--- a/gcc/testsuite/rust.test/compile/loop6.rs
+++ b/gcc/testsuite/rust/compile/torture/loop6.rs
diff --git a/gcc/testsuite/rust.test/compile/loop7.rs b/gcc/testsuite/rust/compile/torture/loop7.rs
index 0cd8445..0cd8445 100644
--- a/gcc/testsuite/rust.test/compile/loop7.rs
+++ b/gcc/testsuite/rust/compile/torture/loop7.rs
diff --git a/gcc/testsuite/rust.test/compile/methods1.rs b/gcc/testsuite/rust/compile/torture/methods1.rs
index df3663f..df3663f 100644
--- a/gcc/testsuite/rust.test/compile/methods1.rs
+++ b/gcc/testsuite/rust/compile/torture/methods1.rs
diff --git a/gcc/testsuite/rust.test/compile/methods2.rs b/gcc/testsuite/rust/compile/torture/methods2.rs
index 72ba29c..72ba29c 100644
--- a/gcc/testsuite/rust.test/compile/methods2.rs
+++ b/gcc/testsuite/rust/compile/torture/methods2.rs
diff --git a/gcc/testsuite/rust.test/compile/methods3.rs b/gcc/testsuite/rust/compile/torture/methods3.rs
index b0cb78f..b0cb78f 100644
--- a/gcc/testsuite/rust.test/compile/methods3.rs
+++ b/gcc/testsuite/rust/compile/torture/methods3.rs
diff --git a/gcc/testsuite/rust.test/compile/name_resolve1.rs b/gcc/testsuite/rust/compile/torture/name_resolve1.rs
index 817f48b..817f48b 100644
--- a/gcc/testsuite/rust.test/compile/name_resolve1.rs
+++ b/gcc/testsuite/rust/compile/torture/name_resolve1.rs
diff --git a/gcc/testsuite/rust.test/compile/nested_struct1.rs b/gcc/testsuite/rust/compile/torture/nested_struct1.rs
index 56ce053..56ce053 100644
--- a/gcc/testsuite/rust.test/compile/nested_struct1.rs
+++ b/gcc/testsuite/rust/compile/torture/nested_struct1.rs
diff --git a/gcc/testsuite/rust.test/compile/never_type1.rs b/gcc/testsuite/rust/compile/torture/never_type1.rs
index 0f15029..0f15029 100644
--- a/gcc/testsuite/rust.test/compile/never_type1.rs
+++ b/gcc/testsuite/rust/compile/torture/never_type1.rs
diff --git a/gcc/testsuite/rust.test/compile/parameter_usage1.rs b/gcc/testsuite/rust/compile/torture/parameter_usage1.rs
index 448e960..448e960 100644
--- a/gcc/testsuite/rust.test/compile/parameter_usage1.rs
+++ b/gcc/testsuite/rust/compile/torture/parameter_usage1.rs
diff --git a/gcc/testsuite/rust.test/compile/parens1.rs b/gcc/testsuite/rust/compile/torture/parens1.rs
index 795eb96..795eb96 100644
--- a/gcc/testsuite/rust.test/compile/parens1.rs
+++ b/gcc/testsuite/rust/compile/torture/parens1.rs
diff --git a/gcc/testsuite/rust.test/compile/raw_identifiers.rs b/gcc/testsuite/rust/compile/torture/raw_identifiers.rs
index 8746f33..8746f33 100644
--- a/gcc/testsuite/rust.test/compile/raw_identifiers.rs
+++ b/gcc/testsuite/rust/compile/torture/raw_identifiers.rs
diff --git a/gcc/testsuite/rust.test/compile/raw_identifiers_keywords.rs b/gcc/testsuite/rust/compile/torture/raw_identifiers_keywords.rs
index c9aa3cf..c9aa3cf 100644
--- a/gcc/testsuite/rust.test/compile/raw_identifiers_keywords.rs
+++ b/gcc/testsuite/rust/compile/torture/raw_identifiers_keywords.rs
diff --git a/gcc/testsuite/rust.test/compile/recursive_fn1.rs b/gcc/testsuite/rust/compile/torture/recursive_fn1.rs
index e13b41f..e13b41f 100644
--- a/gcc/testsuite/rust.test/compile/recursive_fn1.rs
+++ b/gcc/testsuite/rust/compile/torture/recursive_fn1.rs
diff --git a/gcc/testsuite/rust.test/compile/scoping1.rs b/gcc/testsuite/rust/compile/torture/scoping1.rs
index 8bc8ede..8bc8ede 100644
--- a/gcc/testsuite/rust.test/compile/scoping1.rs
+++ b/gcc/testsuite/rust/compile/torture/scoping1.rs
diff --git a/gcc/testsuite/rust.test/compile/self_type1.rs b/gcc/testsuite/rust/compile/torture/self_type1.rs
index 373d6dd..373d6dd 100644
--- a/gcc/testsuite/rust.test/compile/self_type1.rs
+++ b/gcc/testsuite/rust/compile/torture/self_type1.rs
diff --git a/gcc/testsuite/rust.test/compile/shadow1.rs b/gcc/testsuite/rust/compile/torture/shadow1.rs
index b60e793..b60e793 100644
--- a/gcc/testsuite/rust.test/compile/shadow1.rs
+++ b/gcc/testsuite/rust/compile/torture/shadow1.rs
diff --git a/gcc/testsuite/rust.test/compile/shadow2.rs b/gcc/testsuite/rust/compile/torture/shadow2.rs
index 161dc38..161dc38 100644
--- a/gcc/testsuite/rust.test/compile/shadow2.rs
+++ b/gcc/testsuite/rust/compile/torture/shadow2.rs
diff --git a/gcc/testsuite/rust.test/compile/static_function.rs b/gcc/testsuite/rust/compile/torture/static_function.rs
index 8e3a379..8e3a379 100644
--- a/gcc/testsuite/rust.test/compile/static_function.rs
+++ b/gcc/testsuite/rust/compile/torture/static_function.rs
diff --git a/gcc/testsuite/rust.test/compile/static_var1.rs b/gcc/testsuite/rust/compile/torture/static_var1.rs
index 5be0e75..5be0e75 100644
--- a/gcc/testsuite/rust.test/compile/static_var1.rs
+++ b/gcc/testsuite/rust/compile/torture/static_var1.rs
diff --git a/gcc/testsuite/rust.test/compile/stmt_with_block1.rs b/gcc/testsuite/rust/compile/torture/stmt_with_block1.rs
index b6aa56c..b6aa56c 100644
--- a/gcc/testsuite/rust.test/compile/stmt_with_block1.rs
+++ b/gcc/testsuite/rust/compile/torture/stmt_with_block1.rs
diff --git a/gcc/testsuite/rust.test/compile/str1.rs b/gcc/testsuite/rust/compile/torture/str1.rs
index 08882785..08882785 100644
--- a/gcc/testsuite/rust.test/compile/str1.rs
+++ b/gcc/testsuite/rust/compile/torture/str1.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_access1.rs b/gcc/testsuite/rust/compile/torture/struct_access1.rs
index ec85d28..ec85d28 100644
--- a/gcc/testsuite/rust.test/compile/struct_access1.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_access1.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_base_init_1.rs b/gcc/testsuite/rust/compile/torture/struct_base_init_1.rs
index 3c0b24a..3c0b24a 100644
--- a/gcc/testsuite/rust.test/compile/struct_base_init_1.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_base_init_1.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init.rs b/gcc/testsuite/rust/compile/torture/struct_init.rs
index be0b963..be0b963 100644
--- a/gcc/testsuite/rust.test/compile/struct_init.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init_2.rs b/gcc/testsuite/rust/compile/torture/struct_init_2.rs
index d7040d3..d7040d3 100644
--- a/gcc/testsuite/rust.test/compile/struct_init_2.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init_2.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init_3.rs b/gcc/testsuite/rust/compile/torture/struct_init_3.rs
index 5e52d09..5e52d09 100644
--- a/gcc/testsuite/rust.test/compile/struct_init_3.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init_3.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init_4.rs b/gcc/testsuite/rust/compile/torture/struct_init_4.rs
index 57b6bd4..57b6bd4 100644
--- a/gcc/testsuite/rust.test/compile/struct_init_4.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init_4.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init_5.rs b/gcc/testsuite/rust/compile/torture/struct_init_5.rs
index 891f645..891f645 100644
--- a/gcc/testsuite/rust.test/compile/struct_init_5.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init_5.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init_6.rs b/gcc/testsuite/rust/compile/torture/struct_init_6.rs
index e7f8a12..e7f8a12 100644
--- a/gcc/testsuite/rust.test/compile/struct_init_6.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init_6.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init_7.rs b/gcc/testsuite/rust/compile/torture/struct_init_7.rs
index a8c8050..a8c8050 100644
--- a/gcc/testsuite/rust.test/compile/struct_init_7.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init_7.rs
diff --git a/gcc/testsuite/rust.test/compile/struct_init_8.rs b/gcc/testsuite/rust/compile/torture/struct_init_8.rs
index 411ff7d..411ff7d 100644
--- a/gcc/testsuite/rust.test/compile/struct_init_8.rs
+++ b/gcc/testsuite/rust/compile/torture/struct_init_8.rs
diff --git a/gcc/testsuite/rust.test/compile/top_attr.rs b/gcc/testsuite/rust/compile/torture/top_attr.rs
index 0671369..0671369 100644
--- a/gcc/testsuite/rust.test/compile/top_attr.rs
+++ b/gcc/testsuite/rust/compile/torture/top_attr.rs
diff --git a/gcc/testsuite/rust.test/compile/tuple1.rs b/gcc/testsuite/rust/compile/torture/tuple1.rs
index 9e6f613..9e6f613 100644
--- a/gcc/testsuite/rust.test/compile/tuple1.rs
+++ b/gcc/testsuite/rust/compile/torture/tuple1.rs
diff --git a/gcc/testsuite/rust.test/compile/tuple2.rs b/gcc/testsuite/rust/compile/torture/tuple2.rs
index ab3d0b8..ab3d0b8 100644
--- a/gcc/testsuite/rust.test/compile/tuple2.rs
+++ b/gcc/testsuite/rust/compile/torture/tuple2.rs
diff --git a/gcc/testsuite/rust.test/compile/tuple3.rs b/gcc/testsuite/rust/compile/torture/tuple3.rs
index d0fb6fc..d0fb6fc 100644
--- a/gcc/testsuite/rust.test/compile/tuple3.rs
+++ b/gcc/testsuite/rust/compile/torture/tuple3.rs
diff --git a/gcc/testsuite/rust.test/compile/tuple_field_access.rs b/gcc/testsuite/rust/compile/torture/tuple_field_access.rs
index 8d1bbe9..8d1bbe9 100644
--- a/gcc/testsuite/rust.test/compile/tuple_field_access.rs
+++ b/gcc/testsuite/rust/compile/torture/tuple_field_access.rs
diff --git a/gcc/testsuite/rust.test/compile/tuple_struct1.rs b/gcc/testsuite/rust/compile/torture/tuple_struct1.rs
index 0ac19b1..0ac19b1 100644
--- a/gcc/testsuite/rust.test/compile/tuple_struct1.rs
+++ b/gcc/testsuite/rust/compile/torture/tuple_struct1.rs
diff --git a/gcc/testsuite/rust.test/compile/tuple_struct2.rs b/gcc/testsuite/rust/compile/torture/tuple_struct2.rs
index 5e0a76e..5e0a76e 100644
--- a/gcc/testsuite/rust.test/compile/tuple_struct2.rs
+++ b/gcc/testsuite/rust/compile/torture/tuple_struct2.rs
diff --git a/gcc/testsuite/rust.test/compile/type-alias1.rs b/gcc/testsuite/rust/compile/torture/type-alias1.rs
index 78bf046..78bf046 100644
--- a/gcc/testsuite/rust.test/compile/type-alias1.rs
+++ b/gcc/testsuite/rust/compile/torture/type-alias1.rs
diff --git a/gcc/testsuite/rust.test/compile/type-alias2.rs b/gcc/testsuite/rust/compile/torture/type-alias2.rs
index a3e3f4e..a3e3f4e 100644
--- a/gcc/testsuite/rust.test/compile/type-alias2.rs
+++ b/gcc/testsuite/rust/compile/torture/type-alias2.rs
diff --git a/gcc/testsuite/rust.test/compile/type_infer1.rs b/gcc/testsuite/rust/compile/torture/type_infer1.rs
index b6502b5..b6502b5 100644
--- a/gcc/testsuite/rust.test/compile/type_infer1.rs
+++ b/gcc/testsuite/rust/compile/torture/type_infer1.rs
diff --git a/gcc/testsuite/rust.test/compile/type_infer2.rs b/gcc/testsuite/rust/compile/torture/type_infer2.rs
index dcddda4..dcddda4 100644
--- a/gcc/testsuite/rust.test/compile/type_infer2.rs
+++ b/gcc/testsuite/rust/compile/torture/type_infer2.rs
diff --git a/gcc/testsuite/rust.test/compile/type_infer3.rs b/gcc/testsuite/rust/compile/torture/type_infer3.rs
index 303dd3d..303dd3d 100644
--- a/gcc/testsuite/rust.test/compile/type_infer3.rs
+++ b/gcc/testsuite/rust/compile/torture/type_infer3.rs
diff --git a/gcc/testsuite/rust.test/compile/type_infer4.rs b/gcc/testsuite/rust/compile/torture/type_infer4.rs
index 77a919f..77a919f 100644
--- a/gcc/testsuite/rust.test/compile/type_infer4.rs
+++ b/gcc/testsuite/rust/compile/torture/type_infer4.rs
diff --git a/gcc/testsuite/rust.test/compile/type_infer5.rs b/gcc/testsuite/rust/compile/torture/type_infer5.rs
index 1bccb4c..1bccb4c 100644
--- a/gcc/testsuite/rust.test/compile/type_infer5.rs
+++ b/gcc/testsuite/rust/compile/torture/type_infer5.rs
diff --git a/gcc/testsuite/rust.test/compile/type_infer6.rs b/gcc/testsuite/rust/compile/torture/type_infer6.rs
index 6f5863f..6f5863f 100644
--- a/gcc/testsuite/rust.test/compile/type_infer6.rs
+++ b/gcc/testsuite/rust/compile/torture/type_infer6.rs
diff --git a/gcc/testsuite/rust.test/compile/unary_operators.rs b/gcc/testsuite/rust/compile/torture/unary_operators.rs
index 9be729c..9be729c 100644
--- a/gcc/testsuite/rust.test/compile/unary_operators.rs
+++ b/gcc/testsuite/rust/compile/torture/unary_operators.rs
diff --git a/gcc/testsuite/rust.test/compile/underscore_id.rs b/gcc/testsuite/rust/compile/torture/underscore_id.rs
index 2c106c5..2c106c5 100644
--- a/gcc/testsuite/rust.test/compile/underscore_id.rs
+++ b/gcc/testsuite/rust/compile/torture/underscore_id.rs
diff --git a/gcc/testsuite/rust.test/compile/unit_type1.rs b/gcc/testsuite/rust/compile/torture/unit_type1.rs
index d5f7357..d5f7357 100644
--- a/gcc/testsuite/rust.test/compile/unit_type1.rs
+++ b/gcc/testsuite/rust/compile/torture/unit_type1.rs
diff --git a/gcc/testsuite/rust.test/compile/unused.rs b/gcc/testsuite/rust/compile/torture/unused.rs
index 0564aa1..0564aa1 100644
--- a/gcc/testsuite/rust.test/compile/unused.rs
+++ b/gcc/testsuite/rust/compile/torture/unused.rs
diff --git a/gcc/testsuite/rust.test/compile/unused1.rs b/gcc/testsuite/rust/compile/torture/unused1.rs
index 3b4873c..3b4873c 100644
--- a/gcc/testsuite/rust.test/compile/unused1.rs
+++ b/gcc/testsuite/rust/compile/torture/unused1.rs
diff --git a/gcc/testsuite/rust.test/compile/usize1.rs b/gcc/testsuite/rust/compile/torture/usize1.rs
index ba1d5c6..ba1d5c6 100644
--- a/gcc/testsuite/rust.test/compile/usize1.rs
+++ b/gcc/testsuite/rust/compile/torture/usize1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/tuple1.rs b/gcc/testsuite/rust/compile/tuple1.rs
index 84179b1..84179b1 100644
--- a/gcc/testsuite/rust.test/xfail_compile/tuple1.rs
+++ b/gcc/testsuite/rust/compile/tuple1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/tuple_struct1.rs b/gcc/testsuite/rust/compile/tuple_struct1.rs
index 87e4c3b..87e4c3b 100644
--- a/gcc/testsuite/rust.test/xfail_compile/tuple_struct1.rs
+++ b/gcc/testsuite/rust/compile/tuple_struct1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/tuple_struct2.rs b/gcc/testsuite/rust/compile/tuple_struct2.rs
index dba0511..dba0511 100644
--- a/gcc/testsuite/rust.test/xfail_compile/tuple_struct2.rs
+++ b/gcc/testsuite/rust/compile/tuple_struct2.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/tuple_struct3.rs b/gcc/testsuite/rust/compile/tuple_struct3.rs
index c52a610..c52a610 100644
--- a/gcc/testsuite/rust.test/xfail_compile/tuple_struct3.rs
+++ b/gcc/testsuite/rust/compile/tuple_struct3.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/type-alias1.rs b/gcc/testsuite/rust/compile/type-alias1.rs
index c7d7048..c7d7048 100644
--- a/gcc/testsuite/rust.test/xfail_compile/type-alias1.rs
+++ b/gcc/testsuite/rust/compile/type-alias1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/type-bindings1.rs b/gcc/testsuite/rust/compile/type-bindings1.rs
index 4cd045c..4cd045c 100644
--- a/gcc/testsuite/rust.test/xfail_compile/type-bindings1.rs
+++ b/gcc/testsuite/rust/compile/type-bindings1.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/unary_negation.rs b/gcc/testsuite/rust/compile/unary_negation.rs
index 1acb853..1acb853 100644
--- a/gcc/testsuite/rust.test/xfail_compile/unary_negation.rs
+++ b/gcc/testsuite/rust/compile/unary_negation.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/unary_not.rs b/gcc/testsuite/rust/compile/unary_not.rs
index 1620b40..1620b40 100644
--- a/gcc/testsuite/rust.test/xfail_compile/unary_not.rs
+++ b/gcc/testsuite/rust/compile/unary_not.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/unconstrained_type_param.rs b/gcc/testsuite/rust/compile/unconstrained_type_param.rs
index c4aaa10..c4aaa10 100644
--- a/gcc/testsuite/rust.test/xfail_compile/unconstrained_type_param.rs
+++ b/gcc/testsuite/rust/compile/unconstrained_type_param.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/unsafe.rs b/gcc/testsuite/rust/compile/unsafe.rs
index d0cb87d..d0cb87d 100644
--- a/gcc/testsuite/rust.test/xfail_compile/unsafe.rs
+++ b/gcc/testsuite/rust/compile/unsafe.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/unterminated_c_comment.rs b/gcc/testsuite/rust/compile/unterminated_c_comment.rs
index 619b7b7..619b7b7 100644
--- a/gcc/testsuite/rust.test/xfail_compile/unterminated_c_comment.rs
+++ b/gcc/testsuite/rust/compile/unterminated_c_comment.rs
diff --git a/gcc/testsuite/rust.test/xfail_compile/usize1.rs b/gcc/testsuite/rust/compile/usize1.rs
index 8c12789..8c12789 100644
--- a/gcc/testsuite/rust.test/xfail_compile/usize1.rs
+++ b/gcc/testsuite/rust/compile/usize1.rs
diff --git a/gcc/testsuite/rust.test/unsupported/lifetime_param.rs b/gcc/testsuite/rust/compile/xfail/lifetime_param.rs
index 306fca0..306fca0 100644
--- a/gcc/testsuite/rust.test/unsupported/lifetime_param.rs
+++ b/gcc/testsuite/rust/compile/xfail/lifetime_param.rs
diff --git a/gcc/testsuite/rust.test/unsupported/slice1.rs b/gcc/testsuite/rust/compile/xfail/slice1.rs
index 48abcbe..48abcbe 100644
--- a/gcc/testsuite/rust.test/unsupported/slice1.rs
+++ b/gcc/testsuite/rust/compile/xfail/slice1.rs
diff --git a/gcc/testsuite/rust.test/unsupported/struct_field_vis.rs b/gcc/testsuite/rust/compile/xfail/struct_field_vis.rs
index a28729e..a28729e 100644
--- a/gcc/testsuite/rust.test/unsupported/struct_field_vis.rs
+++ b/gcc/testsuite/rust/compile/xfail/struct_field_vis.rs
diff --git a/gcc/testsuite/rust.test/unsupported/unsupported.exp b/gcc/testsuite/rust/compile/xfail/xfail.exp
index 82d19c6..e4a6cf1 100644
--- a/gcc/testsuite/rust.test/unsupported/unsupported.exp
+++ b/gcc/testsuite/rust/compile/xfail/xfail.exp
@@ -14,7 +14,8 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-
+# Compile tests, no torture testing.
+#
 # These tests are used to keep track of known limitations :
 # 1- tests that are incorrecly build instead of being rejected
 # 2- tests that are build to an incorrect result
diff --git a/gcc/testsuite/rust.test/execute/block_expr1.rs b/gcc/testsuite/rust/execute/torture/block_expr1.rs
index d561f8c..d561f8c 100644
--- a/gcc/testsuite/rust.test/execute/block_expr1.rs
+++ b/gcc/testsuite/rust/execute/torture/block_expr1.rs
diff --git a/gcc/testsuite/rust.test/execute/empty_main.rs b/gcc/testsuite/rust/execute/torture/empty_main.rs
index 6442e1e..6442e1e 100644
--- a/gcc/testsuite/rust.test/execute/empty_main.rs
+++ b/gcc/testsuite/rust/execute/torture/empty_main.rs
diff --git a/gcc/testsuite/rust.test/execute/execute.exp b/gcc/testsuite/rust/execute/torture/execute.exp
index f4deaa1..f44534b 100644
--- a/gcc/testsuite/rust.test/execute/execute.exp
+++ b/gcc/testsuite/rust/execute/torture/execute.exp
@@ -14,9 +14,7 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-#
-# Rust torture test suite.
-#
+# Execute tests, torture testing.
 
 # Load support procs.
 load_lib rust-dg.exp
diff --git a/gcc/testsuite/rust.test/execute/exit_error.rs b/gcc/testsuite/rust/execute/torture/exit_error.rs
index c3d0d9f..c3d0d9f 100644
--- a/gcc/testsuite/rust.test/execute/exit_error.rs
+++ b/gcc/testsuite/rust/execute/torture/exit_error.rs
diff --git a/gcc/testsuite/rust.test/execute/func1.rs b/gcc/testsuite/rust/execute/torture/func1.rs
index 0a093d8..0a093d8 100644
--- a/gcc/testsuite/rust.test/execute/func1.rs
+++ b/gcc/testsuite/rust/execute/torture/func1.rs