diff --git a/compiler/rustc_lint/src/context.rs b/compiler/rustc_lint/src/context.rs index 19f3a9b4c062e..561bdd1a2db67 100644 --- a/compiler/rustc_lint/src/context.rs +++ b/compiler/rustc_lint/src/context.rs @@ -154,6 +154,11 @@ impl LintStore { }) } + /// Returns all lint group names, including deprecated/aliased groups + pub fn get_all_group_names(&self) -> impl Iterator { + self.lint_groups.keys().copied() + } + pub fn register_early_pass( &mut self, pass: impl Fn() -> EarlyLintPassObject + 'static + sync::DynSend + sync::DynSync, diff --git a/compiler/rustc_trait_selection/src/traits/query/normalize.rs b/compiler/rustc_trait_selection/src/traits/query/normalize.rs index 02438b24ca7f4..2f83ee046498a 100644 --- a/compiler/rustc_trait_selection/src/traits/query/normalize.rs +++ b/compiler/rustc_trait_selection/src/traits/query/normalize.rs @@ -376,10 +376,14 @@ impl<'a, 'tcx> QueryNormalizer<'a, 'tcx> { // `tcx.normalize_canonicalized_projection` may normalize to a type that // still has unevaluated consts, so keep normalizing here if that's the case. // Similarly, `tcx.normalize_canonicalized_free_alias` will only unwrap one layer - // of type and we need to continue folding it to reveal the TAIT behind it. + // of type/const and we need to continue folding it to reveal the TAIT behind it + // or further normalize nested unevaluated consts. if res != term.to_term(tcx) - && (res.as_type().map_or(false, |t| t.has_type_flags(ty::TypeFlags::HAS_CT_PROJECTION)) - || term.kind(tcx) == ty::AliasTermKind::FreeTy) + && (res.has_type_flags(ty::TypeFlags::HAS_CT_PROJECTION) + || matches!( + term.kind(tcx), + ty::AliasTermKind::FreeTy | ty::AliasTermKind::FreeConst + )) { res.try_fold_with(self) } else { diff --git a/src/tools/clippy/clippy_lints/src/cargo/lint_groups_priority.rs b/src/tools/clippy/clippy_lints/src/cargo/lint_groups_priority.rs index f937f065d6e0d..fbf5f72c53615 100644 --- a/src/tools/clippy/clippy_lints/src/cargo/lint_groups_priority.rs +++ b/src/tools/clippy/clippy_lints/src/cargo/lint_groups_priority.rs @@ -135,7 +135,7 @@ pub fn check(cx: &LateContext<'_>) { { let mut rustc_groups = FxHashSet::default(); let mut clippy_groups = FxHashSet::default(); - for (group, ..) in unerased_lint_store(cx.tcx.sess).get_lint_groups() { + for group in unerased_lint_store(cx.tcx.sess).get_all_group_names() { match group.split_once("::") { None => { rustc_groups.insert(group); diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt index c747636691f60..295cf228815e6 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 237cfb9c4f071..16cdde08431c0 100644 --- a/tests/ui/README.md +++ b/tests/ui/README.md @@ -172,10 +172,6 @@ See: - [`std::box::Boxed`](https://doc.rust-lang.org/std/boxed/struct.Box.html) - [Tracking issue for `box_patterns` feature #29641](https://github.com/rust-lang/rust/issues/29641) -## `tests/ui/btreemap/`: B-Tree Maps - -Tests focused on `BTreeMap` collections and their compiler interactions. E.g. collection patterns, iterator behavior, and trait implementations specific to `BTreeMap`. See [`std::collections::BTreeMap`](https://doc.rust-lang.org/std/collections/struct.BTreeMap.html). - ## `tests/ui/builtin-superkinds/`: Built-in Trait Hierarchy Tests Tests for built-in trait hierarchy (Send, Sync, Sized, etc.) and their supertrait relationships. E.g. auto traits and marker trait constraints. @@ -262,12 +258,10 @@ This directory only contains one highly specific test. Other coinduction tests c ## `tests/ui/collections` -These tests exercise the `collections` library. +These tests exercise the `collections` library. For example, `BTreeMap` and `HashMap`. See [`std::collections`](https://doc.rust-lang.org/std/collections/index.html) -**FIXME**: consider merge with `tests/ui/btreemap` and `tests/ui/hashmap` - ## `tests/ui/command/`: `std::process::Command` This directory is actually for the standard library [`std::process::Command`](https://doc.rust-lang.org/std/process/struct.Command.html) type, where some tests are too difficult or inconvenient to write as unit tests or integration tests within the standard library itself. @@ -518,10 +512,6 @@ The `dyn` keyword is used to highlight that calls to methods on the associated T See [`dyn` keyword](https://doc.rust-lang.org/std/keyword.dyn.html). -## `tests/ui/dynamically-sized-types`: Dynamically Sized Types - -**FIXME**: should be coalesced with `tests/ui/dst`. - ## `tests/ui/editions/`: Rust edition-specific peculiarities These tests run in specific Rust editions, such as Rust 2015 or Rust 2018, and check errors and functionality related to specific now-deprecated idioms and features. @@ -688,10 +678,6 @@ Tests on range patterns where one of the bounds is not a direct value. **FIXME**: Overlaps with `ui/range`. `impossible_range.rs` is particularly suspected to be a duplicate test. -## `tests/ui/hashmap/` - -Tests for the standard library collection [`std::collections::HashMap`](https://doc.rust-lang.org/std/collections/struct.HashMap.html). - ## `tests/ui/higher-ranked/` Tests for higher-ranked trait bounds. @@ -701,10 +687,6 @@ See: - [Higher-ranked trait bounds | rustc-dev-guide](https://rustc-dev-guide.rust-lang.org/traits/hrtb.html) - [Higher-ranked trait bounds | Nomicon](https://doc.rust-lang.org/nomicon/hrtb.html) -## `tests/ui/higher-ranked-trait-bounds` - -**FIXME**: move to `tests/ui/higher-ranked/trait-bounds` - ## `tests/ui/hygiene/` This seems to have been originally intended for "hygienic macros" - macros which work in all contexts, independent of what surrounds them. However, this category has grown into a mish-mash of many tests that may belong in the other directories. @@ -927,12 +909,6 @@ See [Tracking issue for allowing overlapping implementations for marker trait #2 Broad category of tests on `match` constructs. -## `tests/ui/meta/`: Tests for compiletest itself - -These tests check the function of the UI test suite at large and Compiletest in itself. - -**FIXME**: This should absolutely be merged with `tests/ui/compiletest-self-test/`. - ## `tests/ui/methods/` A broad category for anything related to methods and method resolution. @@ -1530,12 +1506,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/meta/no_std-extern-libc.rs b/tests/ui/bootstrap/no_std-extern-libc.rs similarity index 100% rename from tests/ui/meta/no_std-extern-libc.rs rename to tests/ui/bootstrap/no_std-extern-libc.rs diff --git a/tests/ui/btreemap/btreemap-index-mut-2.rs b/tests/ui/collections/btreemap/btreemap-index-mut-2.rs similarity index 100% rename from tests/ui/btreemap/btreemap-index-mut-2.rs rename to tests/ui/collections/btreemap/btreemap-index-mut-2.rs diff --git a/tests/ui/btreemap/btreemap-index-mut-2.stderr b/tests/ui/collections/btreemap/btreemap-index-mut-2.stderr similarity index 100% rename from tests/ui/btreemap/btreemap-index-mut-2.stderr rename to tests/ui/collections/btreemap/btreemap-index-mut-2.stderr diff --git a/tests/ui/btreemap/btreemap-index-mut.rs b/tests/ui/collections/btreemap/btreemap-index-mut.rs similarity index 100% rename from tests/ui/btreemap/btreemap-index-mut.rs rename to tests/ui/collections/btreemap/btreemap-index-mut.rs diff --git a/tests/ui/btreemap/btreemap-index-mut.stderr b/tests/ui/collections/btreemap/btreemap-index-mut.stderr similarity index 100% rename from tests/ui/btreemap/btreemap-index-mut.stderr rename to tests/ui/collections/btreemap/btreemap-index-mut.stderr diff --git a/tests/ui/btreemap/btreemap_dropck.rs b/tests/ui/collections/btreemap/btreemap_dropck.rs similarity index 100% rename from tests/ui/btreemap/btreemap_dropck.rs rename to tests/ui/collections/btreemap/btreemap_dropck.rs diff --git a/tests/ui/btreemap/btreemap_dropck.stderr b/tests/ui/collections/btreemap/btreemap_dropck.stderr similarity index 100% rename from tests/ui/btreemap/btreemap_dropck.stderr rename to tests/ui/collections/btreemap/btreemap_dropck.stderr diff --git a/tests/ui/btreemap/btreemap_into_iterator_lifetime.rs b/tests/ui/collections/btreemap/btreemap_into_iterator_lifetime.rs similarity index 100% rename from tests/ui/btreemap/btreemap_into_iterator_lifetime.rs rename to tests/ui/collections/btreemap/btreemap_into_iterator_lifetime.rs diff --git a/tests/ui/hashmap/hashmap-capacity-overflow.rs b/tests/ui/collections/hashmap/hashmap-capacity-overflow.rs similarity index 100% rename from tests/ui/hashmap/hashmap-capacity-overflow.rs rename to tests/ui/collections/hashmap/hashmap-capacity-overflow.rs diff --git a/tests/ui/hashmap/hashmap-index-mut.rs b/tests/ui/collections/hashmap/hashmap-index-mut.rs similarity index 100% rename from tests/ui/hashmap/hashmap-index-mut.rs rename to tests/ui/collections/hashmap/hashmap-index-mut.rs diff --git a/tests/ui/hashmap/hashmap-index-mut.stderr b/tests/ui/collections/hashmap/hashmap-index-mut.stderr similarity index 100% rename from tests/ui/hashmap/hashmap-index-mut.stderr rename to tests/ui/collections/hashmap/hashmap-index-mut.stderr diff --git a/tests/ui/hashmap/hashmap-iter-value-lifetime.rs b/tests/ui/collections/hashmap/hashmap-iter-value-lifetime.rs similarity index 100% rename from tests/ui/hashmap/hashmap-iter-value-lifetime.rs rename to tests/ui/collections/hashmap/hashmap-iter-value-lifetime.rs diff --git a/tests/ui/hashmap/hashmap-iter-value-lifetime.stderr b/tests/ui/collections/hashmap/hashmap-iter-value-lifetime.stderr similarity index 100% rename from tests/ui/hashmap/hashmap-iter-value-lifetime.stderr rename to tests/ui/collections/hashmap/hashmap-iter-value-lifetime.stderr diff --git a/tests/ui/hashmap/hashmap-lifetimes.rs b/tests/ui/collections/hashmap/hashmap-lifetimes.rs similarity index 100% rename from tests/ui/hashmap/hashmap-lifetimes.rs rename to tests/ui/collections/hashmap/hashmap-lifetimes.rs diff --git a/tests/ui/hashmap/hashmap-lifetimes.stderr b/tests/ui/collections/hashmap/hashmap-lifetimes.stderr similarity index 100% rename from tests/ui/hashmap/hashmap-lifetimes.stderr rename to tests/ui/collections/hashmap/hashmap-lifetimes.stderr diff --git a/tests/ui/hashmap/hashmap-memory.rs b/tests/ui/collections/hashmap/hashmap-memory.rs similarity index 100% rename from tests/ui/hashmap/hashmap-memory.rs rename to tests/ui/collections/hashmap/hashmap-memory.rs diff --git a/tests/ui/hashmap/hashmap-path-key.rs b/tests/ui/collections/hashmap/hashmap-path-key.rs similarity index 100% rename from tests/ui/hashmap/hashmap-path-key.rs rename to tests/ui/collections/hashmap/hashmap-path-key.rs diff --git a/tests/ui/hashmap/hashset-enum-variant.rs b/tests/ui/collections/hashmap/hashset-enum-variant.rs similarity index 100% rename from tests/ui/hashmap/hashset-enum-variant.rs rename to tests/ui/collections/hashmap/hashset-enum-variant.rs diff --git a/tests/ui/hashmap/hashset_generics.rs b/tests/ui/collections/hashmap/hashset_generics.rs similarity index 100% rename from tests/ui/hashmap/hashset_generics.rs rename to tests/ui/collections/hashmap/hashset_generics.rs diff --git a/tests/ui/hashmap/hashset_generics.stderr b/tests/ui/collections/hashmap/hashset_generics.stderr similarity index 100% rename from tests/ui/hashmap/hashset_generics.stderr rename to tests/ui/collections/hashmap/hashset_generics.stderr diff --git a/tests/ui/meta/auxiliary/env.rs b/tests/ui/compiletest-self-test/auxiliary/env.rs similarity index 100% rename from tests/ui/meta/auxiliary/env.rs rename to tests/ui/compiletest-self-test/auxiliary/env.rs diff --git a/tests/ui/meta/dir.with.dots/test.rs b/tests/ui/compiletest-self-test/dir.with.dots/test.rs similarity index 100% rename from tests/ui/meta/dir.with.dots/test.rs rename to tests/ui/compiletest-self-test/dir.with.dots/test.rs diff --git a/tests/ui/meta/expected-error-correct-rev.a.stderr b/tests/ui/compiletest-self-test/expected-error-correct-rev.a.stderr similarity index 100% rename from tests/ui/meta/expected-error-correct-rev.a.stderr rename to tests/ui/compiletest-self-test/expected-error-correct-rev.a.stderr diff --git a/tests/ui/meta/expected-error-correct-rev.rs b/tests/ui/compiletest-self-test/expected-error-correct-rev.rs similarity index 100% rename from tests/ui/meta/expected-error-correct-rev.rs rename to tests/ui/compiletest-self-test/expected-error-correct-rev.rs diff --git a/tests/ui/meta/meta-expected-error-wrong-rev.a.stderr b/tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.a.stderr similarity index 100% rename from tests/ui/meta/meta-expected-error-wrong-rev.a.stderr rename to tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.a.stderr diff --git a/tests/ui/meta/meta-expected-error-wrong-rev.rs b/tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.rs similarity index 100% rename from tests/ui/meta/meta-expected-error-wrong-rev.rs rename to tests/ui/compiletest-self-test/meta-expected-error-wrong-rev.rs diff --git a/tests/ui/meta/revision-bad.rs b/tests/ui/compiletest-self-test/revision-bad.rs similarity index 100% rename from tests/ui/meta/revision-bad.rs rename to tests/ui/compiletest-self-test/revision-bad.rs diff --git a/tests/ui/meta/revision-ok.rs b/tests/ui/compiletest-self-test/revision-ok.rs similarity index 100% rename from tests/ui/meta/revision-ok.rs rename to tests/ui/compiletest-self-test/revision-ok.rs diff --git a/tests/ui/meta/rustc-env.rs b/tests/ui/compiletest-self-test/rustc-env.rs similarity index 100% rename from tests/ui/meta/rustc-env.rs rename to tests/ui/compiletest-self-test/rustc-env.rs diff --git a/tests/ui/dynamically-sized-types/dst-coerce-custom.rs b/tests/ui/dst/dst-coerce-custom.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coerce-custom.rs rename to tests/ui/dst/dst-coerce-custom.rs diff --git a/tests/ui/dynamically-sized-types/dst-coerce-rc.rs b/tests/ui/dst/dst-coerce-rc.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coerce-rc.rs rename to tests/ui/dst/dst-coerce-rc.rs diff --git a/tests/ui/dynamically-sized-types/dst-coercions.rs b/tests/ui/dst/dst-coercions.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coercions.rs rename to tests/ui/dst/dst-coercions.rs diff --git a/tests/ui/dynamically-sized-types/dst-coercions.stderr b/tests/ui/dst/dst-coercions.stderr similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coercions.stderr rename to tests/ui/dst/dst-coercions.stderr diff --git a/tests/ui/dynamically-sized-types/dst-deref-mut.rs b/tests/ui/dst/dst-deref-mut.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-deref-mut.rs rename to tests/ui/dst/dst-deref-mut.rs diff --git a/tests/ui/dynamically-sized-types/dst-deref.rs b/tests/ui/dst/dst-deref.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-deref.rs rename to tests/ui/dst/dst-deref.rs diff --git a/tests/ui/dynamically-sized-types/dst-field-align.rs b/tests/ui/dst/dst-field-align.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-field-align.rs rename to tests/ui/dst/dst-field-align.rs diff --git a/tests/ui/dst/dst-index.rs b/tests/ui/dst/dst-index-fail.rs similarity index 100% rename from tests/ui/dst/dst-index.rs rename to tests/ui/dst/dst-index-fail.rs diff --git a/tests/ui/dst/dst-index.stderr b/tests/ui/dst/dst-index-fail.stderr similarity index 85% rename from tests/ui/dst/dst-index.stderr rename to tests/ui/dst/dst-index-fail.stderr index d38af3f89c21b..a5481e9ad6735 100644 --- a/tests/ui/dst/dst-index.stderr +++ b/tests/ui/dst/dst-index-fail.stderr @@ -1,23 +1,23 @@ error[E0161]: cannot move a value of type `str` - --> $DIR/dst-index.rs:31:5 + --> $DIR/dst-index-fail.rs:31:5 | LL | S[0]; | ^^^^ the size of `str` cannot be statically determined error[E0161]: cannot move a value of type `dyn Debug` - --> $DIR/dst-index.rs:34:5 + --> $DIR/dst-index-fail.rs:34:5 | LL | T[0]; | ^^^^ the size of `dyn Debug` cannot be statically determined error[E0507]: cannot move out of index of `S` - --> $DIR/dst-index.rs:31:5 + --> $DIR/dst-index-fail.rs:31:5 | LL | S[0]; | ^^^^ move occurs because value has type `str`, which does not implement the `Copy` trait error[E0507]: cannot move out of index of `T` - --> $DIR/dst-index.rs:34:5 + --> $DIR/dst-index-fail.rs:34:5 | LL | T[0]; | ^^^^ move occurs because value has type `dyn Debug`, which does not implement the `Copy` trait diff --git a/tests/ui/dynamically-sized-types/dst-index.rs b/tests/ui/dst/dst-index-success.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-index.rs rename to tests/ui/dst/dst-index-success.rs diff --git a/tests/ui/dynamically-sized-types/dst-irrefutable-bind.rs b/tests/ui/dst/dst-irrefutable-bind.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-irrefutable-bind.rs rename to tests/ui/dst/dst-irrefutable-bind.rs diff --git a/tests/ui/dynamically-sized-types/dst-raw.rs b/tests/ui/dst/dst-raw.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-raw.rs rename to tests/ui/dst/dst-raw.rs diff --git a/tests/ui/dynamically-sized-types/dst-struct-sole.rs b/tests/ui/dst/dst-struct-sole.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-struct-sole.rs rename to tests/ui/dst/dst-struct-sole.rs diff --git a/tests/ui/dynamically-sized-types/dst-struct.rs b/tests/ui/dst/dst-struct.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-struct.rs rename to tests/ui/dst/dst-struct.rs diff --git a/tests/ui/dynamically-sized-types/dst-trait.rs b/tests/ui/dst/dst-trait.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-trait.rs rename to tests/ui/dst/dst-trait.rs diff --git a/tests/ui/generic-const-items/type-const-nested-assoc-const.rs b/tests/ui/generic-const-items/type-const-nested-assoc-const.rs new file mode 100644 index 0000000000000..72a3098b76cfe --- /dev/null +++ b/tests/ui/generic-const-items/type-const-nested-assoc-const.rs @@ -0,0 +1,18 @@ +//@ check-pass + +#![feature(generic_const_items, min_generic_const_args)] +#![allow(incomplete_features)] + +type const CT: usize = { ::N }; + +trait Trait { + type const N: usize; +} + +impl Trait for T { + type const N:usize = 0; +} + +fn f(_x: [(); CT::<()>]) {} + +fn main() {} diff --git a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.rs similarity index 81% rename from tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs rename to tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.rs index d1a4e09243ecf..d0d09f11a5748 100644 --- a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs +++ b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.rs @@ -1,6 +1,4 @@ -// https://github.com/rust-lang/rust/issues/60218 -// Regression test for #60218 -// +// Regression test for https://github.com/rust-lang/rust/issues/60218 // This was reported to cause ICEs. use std::iter::Map; diff --git a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.stderr similarity index 85% rename from tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr rename to tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.stderr index 4c403bcbd601f..b02179f141251 100644 --- a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr +++ b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&u32: Foo` is not satisfied - --> $DIR/higher-trait-bounds-ice-60218.rs:19:19 + --> $DIR/higher-trait-bounds-ice-60218.rs:17:19 | LL | trigger_error(vec![], |x: &u32| x) | ------------- ^^^^^^ the trait `Foo` is not implemented for `&u32` @@ -7,12 +7,12 @@ LL | trigger_error(vec![], |x: &u32| x) | required by a bound introduced by this call | help: this trait has no implementations, consider adding one - --> $DIR/higher-trait-bounds-ice-60218.rs:8:1 + --> $DIR/higher-trait-bounds-ice-60218.rs:6:1 | LL | pub trait Foo {} | ^^^^^^^^^^^^^ note: required by a bound in `trigger_error` - --> $DIR/higher-trait-bounds-ice-60218.rs:14:72 + --> $DIR/higher-trait-bounds-ice-60218.rs:12:72 | LL | pub fn trigger_error(iterable: I, functor: F) | ------------- required by a bound in this function 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 f34b5ab5dde74..e023ec58d1adf 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 f34b5ab5dde74..e023ec58d1adf 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