diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt index c747636691f6..295cf228815e 100644 --- a/src/tools/tidy/src/issues.txt +++ b/src/tools/tidy/src/issues.txt @@ -2978,7 +2978,6 @@ ui/unboxed-closures/issue-18652.rs ui/unboxed-closures/issue-18661.rs ui/unboxed-closures/issue-30906.rs ui/unboxed-closures/issue-53448.rs -ui/underscore-imports/issue-110164.rs ui/uniform-paths/auxiliary/issue-53691.rs ui/uniform-paths/issue-53691.rs ui/uninhabited/issue-107505.rs diff --git a/tests/ui/README.md b/tests/ui/README.md index 612661dae907..faf1721e0b03 100644 --- a/tests/ui/README.md +++ b/tests/ui/README.md @@ -1526,12 +1526,6 @@ See [RFC 0132 Unified Function Call Syntax](https://github.com/rust-lang/rfcs/bl See [Tracking issue for Fn traits (`unboxed_closures` & `fn_traits` feature)](https://github.com/rust-lang/rust/issues/29625). -## `tests/ui/underscore-imports/` - -See [Underscore imports | Reference](https://doc.rust-lang.org/reference/items/use-declarations.html#underscore-imports). - -**FIXME**: should become a subdirectory of `tests/ui/imports/`. - ## `tests/ui/underscore-lifetime/`: `'_` elided lifetime Exercises [anonymous elided lifetimes](https://doc.rust-lang.org/reference/lifetime-elision.html). diff --git a/tests/ui/underscore-imports/auxiliary/duplicate.rs b/tests/ui/imports/underscore-imports/auxiliary/duplicate.rs similarity index 100% rename from tests/ui/underscore-imports/auxiliary/duplicate.rs rename to tests/ui/imports/underscore-imports/auxiliary/duplicate.rs diff --git a/tests/ui/underscore-imports/auxiliary/underscore-imports.rs b/tests/ui/imports/underscore-imports/auxiliary/underscore-imports.rs similarity index 100% rename from tests/ui/underscore-imports/auxiliary/underscore-imports.rs rename to tests/ui/imports/underscore-imports/auxiliary/underscore-imports.rs diff --git a/tests/ui/underscore-imports/basic.rs b/tests/ui/imports/underscore-imports/basic.rs similarity index 100% rename from tests/ui/underscore-imports/basic.rs rename to tests/ui/imports/underscore-imports/basic.rs diff --git a/tests/ui/underscore-imports/basic.stderr b/tests/ui/imports/underscore-imports/basic.stderr similarity index 100% rename from tests/ui/underscore-imports/basic.stderr rename to tests/ui/imports/underscore-imports/basic.stderr diff --git a/tests/ui/underscore-imports/cycle.rs b/tests/ui/imports/underscore-imports/cycle.rs similarity index 100% rename from tests/ui/underscore-imports/cycle.rs rename to tests/ui/imports/underscore-imports/cycle.rs diff --git a/tests/ui/underscore-imports/duplicate.rs b/tests/ui/imports/underscore-imports/duplicate.rs similarity index 100% rename from tests/ui/underscore-imports/duplicate.rs rename to tests/ui/imports/underscore-imports/duplicate.rs diff --git a/tests/ui/underscore-imports/hygiene-2.rs b/tests/ui/imports/underscore-imports/hygiene-2.rs similarity index 100% rename from tests/ui/underscore-imports/hygiene-2.rs rename to tests/ui/imports/underscore-imports/hygiene-2.rs diff --git a/tests/ui/underscore-imports/hygiene.rs b/tests/ui/imports/underscore-imports/hygiene.rs similarity index 100% rename from tests/ui/underscore-imports/hygiene.rs rename to tests/ui/imports/underscore-imports/hygiene.rs diff --git a/tests/ui/underscore-imports/intercrate.rs b/tests/ui/imports/underscore-imports/intercrate.rs similarity index 100% rename from tests/ui/underscore-imports/intercrate.rs rename to tests/ui/imports/underscore-imports/intercrate.rs diff --git a/tests/ui/underscore-imports/issue-110164.ed2015.stderr b/tests/ui/imports/underscore-imports/invalid-path-110164.ed2015.stderr similarity index 79% rename from tests/ui/underscore-imports/issue-110164.ed2015.stderr rename to tests/ui/imports/underscore-imports/invalid-path-110164.ed2015.stderr index f34b5ab5dde7..e023ec58d1ad 100644 --- a/tests/ui/underscore-imports/issue-110164.ed2015.stderr +++ b/tests/ui/imports/underscore-imports/invalid-path-110164.ed2015.stderr @@ -1,35 +1,35 @@ error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:8:5 + --> $DIR/invalid-path-110164.rs:8:5 | LL | use _::a; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:10:5 + --> $DIR/invalid-path-110164.rs:10:5 | LL | use _::*; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:14:9 + --> $DIR/invalid-path-110164.rs:14:9 | LL | use _::a; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:16:9 + --> $DIR/invalid-path-110164.rs:16:9 | LL | use _::*; | ^ expected identifier, found reserved identifier error[E0432]: unresolved import `self::*` - --> $DIR/issue-110164.rs:4:5 + --> $DIR/invalid-path-110164.rs:4:5 | LL | use self::*; | ^^^^^^^ cannot glob-import a module into itself error[E0432]: unresolved import `crate::*` - --> $DIR/issue-110164.rs:6:5 + --> $DIR/invalid-path-110164.rs:6:5 | LL | use crate::*; | ^^^^^^^^ cannot glob-import a module into itself diff --git a/tests/ui/underscore-imports/issue-110164.ed2021.stderr b/tests/ui/imports/underscore-imports/invalid-path-110164.ed2021.stderr similarity index 79% rename from tests/ui/underscore-imports/issue-110164.ed2021.stderr rename to tests/ui/imports/underscore-imports/invalid-path-110164.ed2021.stderr index f34b5ab5dde7..e023ec58d1ad 100644 --- a/tests/ui/underscore-imports/issue-110164.ed2021.stderr +++ b/tests/ui/imports/underscore-imports/invalid-path-110164.ed2021.stderr @@ -1,35 +1,35 @@ error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:8:5 + --> $DIR/invalid-path-110164.rs:8:5 | LL | use _::a; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:10:5 + --> $DIR/invalid-path-110164.rs:10:5 | LL | use _::*; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:14:9 + --> $DIR/invalid-path-110164.rs:14:9 | LL | use _::a; | ^ expected identifier, found reserved identifier error: expected identifier, found reserved identifier `_` - --> $DIR/issue-110164.rs:16:9 + --> $DIR/invalid-path-110164.rs:16:9 | LL | use _::*; | ^ expected identifier, found reserved identifier error[E0432]: unresolved import `self::*` - --> $DIR/issue-110164.rs:4:5 + --> $DIR/invalid-path-110164.rs:4:5 | LL | use self::*; | ^^^^^^^ cannot glob-import a module into itself error[E0432]: unresolved import `crate::*` - --> $DIR/issue-110164.rs:6:5 + --> $DIR/invalid-path-110164.rs:6:5 | LL | use crate::*; | ^^^^^^^^ cannot glob-import a module into itself diff --git a/tests/ui/underscore-imports/issue-110164.rs b/tests/ui/imports/underscore-imports/invalid-path-110164.rs similarity index 100% rename from tests/ui/underscore-imports/issue-110164.rs rename to tests/ui/imports/underscore-imports/invalid-path-110164.rs diff --git a/tests/ui/underscore-imports/macro-expanded.rs b/tests/ui/imports/underscore-imports/macro-expanded.rs similarity index 100% rename from tests/ui/underscore-imports/macro-expanded.rs rename to tests/ui/imports/underscore-imports/macro-expanded.rs diff --git a/tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2015.stderr b/tests/ui/imports/underscore-imports/multiple-extern-by-macro-for-underscore.ed2015.stderr similarity index 100% rename from tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2015.stderr rename to tests/ui/imports/underscore-imports/multiple-extern-by-macro-for-underscore.ed2015.stderr diff --git a/tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2021.stderr b/tests/ui/imports/underscore-imports/multiple-extern-by-macro-for-underscore.ed2021.stderr similarity index 100% rename from tests/ui/imports/multiple-extern-by-macro-for-underscore.ed2021.stderr rename to tests/ui/imports/underscore-imports/multiple-extern-by-macro-for-underscore.ed2021.stderr diff --git a/tests/ui/imports/multiple-extern-by-macro-for-underscore.rs b/tests/ui/imports/underscore-imports/multiple-extern-by-macro-for-underscore.rs similarity index 100% rename from tests/ui/imports/multiple-extern-by-macro-for-underscore.rs rename to tests/ui/imports/underscore-imports/multiple-extern-by-macro-for-underscore.rs diff --git a/tests/ui/underscore-imports/multiple-uses.ed2015.stderr b/tests/ui/imports/underscore-imports/multiple-uses.ed2015.stderr similarity index 100% rename from tests/ui/underscore-imports/multiple-uses.ed2015.stderr rename to tests/ui/imports/underscore-imports/multiple-uses.ed2015.stderr diff --git a/tests/ui/underscore-imports/multiple-uses.ed2021.stderr b/tests/ui/imports/underscore-imports/multiple-uses.ed2021.stderr similarity index 100% rename from tests/ui/underscore-imports/multiple-uses.ed2021.stderr rename to tests/ui/imports/underscore-imports/multiple-uses.ed2021.stderr diff --git a/tests/ui/underscore-imports/multiple-uses.rs b/tests/ui/imports/underscore-imports/multiple-uses.rs similarity index 100% rename from tests/ui/underscore-imports/multiple-uses.rs rename to tests/ui/imports/underscore-imports/multiple-uses.rs diff --git a/tests/ui/underscore-imports/shadow.rs b/tests/ui/imports/underscore-imports/shadow.rs similarity index 100% rename from tests/ui/underscore-imports/shadow.rs rename to tests/ui/imports/underscore-imports/shadow.rs diff --git a/tests/ui/underscore-imports/shadow.stderr b/tests/ui/imports/underscore-imports/shadow.stderr similarity index 100% rename from tests/ui/underscore-imports/shadow.stderr rename to tests/ui/imports/underscore-imports/shadow.stderr diff --git a/tests/ui/underscore-imports/unused-2018.rs b/tests/ui/imports/underscore-imports/unused-2018.rs similarity index 100% rename from tests/ui/underscore-imports/unused-2018.rs rename to tests/ui/imports/underscore-imports/unused-2018.rs diff --git a/tests/ui/underscore-imports/unused-2018.stderr b/tests/ui/imports/underscore-imports/unused-2018.stderr similarity index 100% rename from tests/ui/underscore-imports/unused-2018.stderr rename to tests/ui/imports/underscore-imports/unused-2018.stderr