Rollup merge of rust-lang#149411 - reddevilmidzy:t5, r=Kivooeo

Tidying up UI tests [5/N]

> [!NOTE]
> Intermediate commits are intended to help review, but will be squashed prior to merge.

part of rust-lang#133895

merge directory

* `macro_backtrace` -> `macros`
* `missing_non_modrs_mod` -> `modules`
* `modules_and_files_visibility` -> `modules`
* `qualified` -> `typeck`
* `while` -> `for-loop-whlie`

r? Kivooeo

Author: matthiaskrgr

tests/ui/README.md

@@ -891,12 +891,6 @@ Exercise *Link-Time Optimization* (LTO), involving the flags `-C lto` or `-Z thi
 
 Tests on changes to inference variable lattice LUB/GLB, see <https://github.com/rust-lang/rust/pull/45853>.
 
-## `tests/ui/macro_backtrace/`: `-Zmacro-backtrace`
-
-Contains a single test, checking the unstable command-line flag to enable detailed macro backtraces.
-
-**FIXME**: This could be merged with `ui/macros`, which already contains other macro backtrace tests.
-
 ## `tests/ui/macros/`
 
 Broad category of tests on macros.
@@ -945,12 +939,6 @@ Something is missing which could be added to fix (e.g. suggestions).
 
 **FIXME**: this is way too vague, tests should be rehomed.
 
-## `tests/ui/missing_non_modrs_mod/`
-
-This directory is a small tree of `mod` dependencies, but the root, `foo.rs`, is looking for a file which does not exist. The test checks that the error is reported at the top-level module.
-
-**FIXME**: Merge with `tests/ui/modules/`.
-
 ## `tests/ui/missing-trait-bounds/`
 
 Tests for checking missing trait bounds, and their diagnostics.
@@ -963,10 +951,6 @@ Tests on the module system.
 
 **FIXME**: `tests/ui/imports/` should probably be merged with this.
 
-## `tests/ui/modules_and_files_visibility/`
-
-**FIXME**: Merge with `tests/ui/modules/`.
-
 ## `tests/ui/moves`
 
 Tests on moves (destructive moves).
@@ -1135,12 +1119,6 @@ A large category about function and type public/private visibility, and its impa
 
 **FIXME**: merge with `tests/ui/privacy/`.
 
-## `tests/ui/qualified/`
-
-Contains few tests on qualified paths where a type parameter is provided at the end: `type A = <S as Tr>::A::f<u8>;`. The tests check if this fails during type checking, not parsing.
-
-**FIXME**: Should be rehomed to `ui/typeck`.
-
 ## `tests/ui/query-system/`
 
 Tests on Rust methods and functions which use the query system, such as `std::mem::size_of`. These compute information about the current runtime and return it. See [Query system | rustc-dev-guide](https://rustc-dev-guide.rust-lang.org/query.html).
@@ -1583,12 +1561,6 @@ Tests on various well-formedness checks, e.g. [Type-checking normal functions](h
 
 Tests on `where` clauses. See [Where clauses | Reference](https://doc.rust-lang.org/reference/items/generics.html#where-clauses).
 
-## `tests/ui/while/`
-
-Tests on the `while` keyword and the `while` construct.
-
-**FIXME**: merge with `ui/for-loop-while`.
-
 ## `tests/ui/windows-subsystem/`: `#![windows_subsystem = ""]`
 
 See [the `windows_subsystem` attribute](https://doc.rust-lang.org/reference/runtime.html#the-windows_subsystem-attribute).

tests/ui/while/while-else-err.rs renamed to tests/ui/for-loop-while/while-else-err.rs

@@ -1,4 +1,5 @@
 //@ check-pass
+// regression test for #40235
 #![allow(unused_variables)]
 fn foo() {}
 

tests/ui/while/while-else-err.stderr renamed to tests/ui/for-loop-while/while-else-err.stderr

@@ -1,30 +1,30 @@
-// Test that the macro backtrace facility works (supporting file)
+// Test that the macro backtrace facility works (supporting macro-backtrace-complex.rs)
 
 // a non-local macro
 #[macro_export]
 macro_rules! ping {
     () => {
         pong!();
-    }
+    };
 }
 
 #[macro_export]
 macro_rules! deep {
     () => {
         foo!();
-    }
+    };
 }
 
 #[macro_export]
 macro_rules! foo {
     () => {
         bar!();
-    }
+    };
 }
 
 #[macro_export]
 macro_rules! bar {
     () => {
         ping!();
-    }
+    };
 }

tests/ui/while/while-else-let-else-err.rs renamed to tests/ui/for-loop-while/while-else-let-else-err.rs

@@ -1,5 +1,5 @@
 error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:10:20
+  --> $DIR/macro-backtrace-complex.rs:12:20
    |
 LL | / macro_rules! pong {
 LL | |     () => { syntax error };
@@ -11,7 +11,7 @@ LL |       pong!();
    |       ------- in this macro invocation
 
 error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:10:20
+  --> $DIR/macro-backtrace-complex.rs:12:20
    |
 LL | / macro_rules! pong {
 LL | |     () => { syntax error };
@@ -31,7 +31,7 @@ LL |           pong!();
    |           ------- in this macro invocation (#2)
 
 error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:10:20
+  --> $DIR/macro-backtrace-complex.rs:12:20
    |
 LL | / macro_rules! pong {
 LL | |     () => { syntax error };

tests/ui/while/while-else-let-else-err.stderr renamed to tests/ui/for-loop-while/while-else-let-else-err.stderr

@@ -1,5 +1,5 @@
 error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:10:20
+  --> $DIR/macro-backtrace-complex.rs:12:20
    |
 LL |     () => { syntax error };
    |                    ^^^^^ expected one of 8 possible tokens
@@ -10,7 +10,7 @@ LL |     pong!();
    = note: this error originates in the macro `pong` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:10:20
+  --> $DIR/macro-backtrace-complex.rs:12:20
    |
 LL |     () => { syntax error };
    |                    ^^^^^ expected one of 8 possible tokens
@@ -21,7 +21,7 @@ LL |     ping!();
    = note: this error originates in the macro `pong` which comes from the expansion of the macro `ping` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:10:20
+  --> $DIR/macro-backtrace-complex.rs:12:20
    |
 LL |     () => { syntax error };
    |                    ^^^^^ expected one of 8 possible tokens

tests/ui/while/while-let-scope-issue-40235.rs renamed to tests/ui/for-loop-while/while-let-scope.rs

@@ -1,9 +1,11 @@
-// Test that the macro backtrace facility works
+// Test the unstable command-line flag (-Z macro-backtrace) to enable detailed macro backtraces
+// across nested local and external macros.
 //@ aux-build:ping.rs
 //@ revisions: default -Zmacro-backtrace
 //@[-Zmacro-backtrace] compile-flags: -Z macro-backtrace
 
-#[macro_use] extern crate ping;
+#[macro_use]
+extern crate ping;
 
 // a local macro
 macro_rules! pong {