Move and clean up some ui test

src/tools/tidy/src/issues.txt

@@ -834,8 +834,6 @@ ui/cycle-trait/issue-12511.rs
 ui/debuginfo/issue-105386-debuginfo-ub.rs
 ui/deprecation/issue-66340-deprecated-attr-non-meta-grammar.rs
 ui/deprecation/issue-84637-deprecated-associated-function.rs
-ui/deref-patterns/issue-71676-1.rs
-ui/deref-patterns/issue-71676-2.rs
 ui/derived-errors/issue-30580.rs
 ui/derived-errors/issue-31997-1.rs
 ui/derived-errors/issue-31997.rs
@@ -1465,10 +1463,8 @@ ui/lint/issue-63364.rs
 ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
 ui/lint/issue-79744.rs
 ui/lint/issue-81218.rs
-ui/lint/issue-83477.rs
 ui/lint/issue-87274-paren-parent.rs
 ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
-ui/lint/issue-97094.rs
 ui/lint/issue-99387.rs
 ui/lint/let_underscore/issue-119696-err-on-fn.rs
 ui/lint/let_underscore/issue-119697-extra-let.rs

tests/ui/README.md

@@ -398,14 +398,6 @@ Tests for `#[deprecated]` attribute and `deprecated_in_future` internal lint.
 
 Tests for `Deref` and `DerefMut` traits.
 
-## `tests/ui/deref-patterns`: `#![feature(deref_patterns)]` and `#![feature(string_deref_patterns)]`
-
-Tests for `#![feature(deref_patterns)]` and `#![feature(string_deref_patterns)]`. See [Deref patterns | The Unstable book](https://doc.rust-lang.org/nightly/unstable-book/language-features/deref-patterns.html).
-
-**FIXME**: May have some overlap with `tests/ui/pattern/deref-patterns`.
-
-See [`std::ops::Deref`](https://doc.rust-lang.org/std/ops/trait.Deref.html) and [`std::ops::DerefMut`](https://doc.rust-lang.org/std/ops/trait.DerefMut.html)
-
 ## `tests/ui/derived-errors/`: Derived Error Messages
 
 Tests for quality of diagnostics involving suppression of cascading errors in some cases to avoid overwhelming the user.
@@ -1166,14 +1158,6 @@ Exercises `[Type; n]` syntax for creating arrays with repeated types across a se
 
 Tests on the `#[repr(..)]` attribute. See [Representations | Reference](https://doc.rust-lang.org/reference/type-layout.html#representations).
 
-## `tests/ui/reserved/`
-
-Reserved keywords and attribute names.
-
-See e.g. [Reserved keywords | Reference](https://doc.rust-lang.org/reference/keywords.html).
-
-**FIXME**: maybe merge under `tests/ui/keyword/`.
-
 ## `tests/ui/resolve/`: Name resolution
 
 See [Name resolution | rustc-dev-guide](https://rustc-dev-guide.rust-lang.org/name-resolution.html).
@@ -1500,12 +1484,6 @@ See [Uninhabited | Reference](https://doc.rust-lang.org/reference/glossary.html?
 
 See [Unions | Reference](https://doc.rust-lang.org/reference/items/unions.html).
 
-## `tests/ui/unknown-unstable-lints/`: Attempting to refer to an unstable lint which does not exist
-
-Tests for trying to use non-existent unstable lints.
-
-**FIXME**: move this under `tests/ui/lints/`.
-
 ## `tests/ui/unop/`: Unary operators `-`, `*` and `!`
 
 Tests the three unary operators for negating, dereferencing and inverting, across different contexts.

tests/ui/unknown-unstable-lints/deny-unstable-lint-command-line.rs → tests/ui/lint/unknown-lints/deny-unstable-lint-command-line.rs

@@ -1,6 +1,5 @@
 //~ ERROR unknown lint: `test_unstable_lint`
 //~^ NOTE the `test_unstable_lint` lint is unstable
-//@ check-fail
 //@ compile-flags: -Dunknown_lints -Atest_unstable_lint
 //@ dont-require-annotations: NOTE
 

tests/ui/unknown-unstable-lints/deny-unstable-lint-inline.rs → tests/ui/lint/unknown-lints/deny-unstable-lint-inline.rs

@@ -1,5 +1,3 @@
-//@ check-fail
-
 #![deny(unknown_lints)]
 #![allow(test_unstable_lint)]
 //~^ ERROR unknown lint: `test_unstable_lint`

tests/ui/unknown-unstable-lints/deny-unstable-lint-inline.stderr → tests/ui/lint/unknown-lints/deny-unstable-lint-inline.stderr

@@ -1,5 +1,5 @@
 error: unknown lint: `test_unstable_lint`
-  --> $DIR/deny-unstable-lint-inline.rs:4:10
+  --> $DIR/deny-unstable-lint-inline.rs:2:10
    |
 LL | #![allow(test_unstable_lint)]
    |          ^^^^^^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | #![allow(test_unstable_lint)]
    = help: add `#![feature(test_unstable_lint)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 note: the lint level is defined here
-  --> $DIR/deny-unstable-lint-inline.rs:3:9
+  --> $DIR/deny-unstable-lint-inline.rs:1:9
    |
 LL | #![deny(unknown_lints)]
    |         ^^^^^^^^^^^^^

tests/ui/lint/issue-83477.stderr → tests/ui/lint/unknown-lints/redundant-path-83477.stderr

@@ -1,26 +1,26 @@
 warning: unknown lint: `rustc::foo::bar::default_hash_types`
-  --> $DIR/issue-83477.rs:5:9
+  --> $DIR/redundant-path-83477.rs:5:9
    |
 LL | #[allow(rustc::foo::bar::default_hash_types)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `rustc::default_hash_types`
    |
    = note: `#[warn(unknown_lints)]` on by default
 
 warning: unknown lint: `rustc::foo::default_hash_types`
-  --> $DIR/issue-83477.rs:9:9
+  --> $DIR/redundant-path-83477.rs:9:9
    |
 LL | #[allow(rustc::foo::default_hash_types)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `rustc::default_hash_types`
 
 warning: prefer `FxHashMap` over `HashMap`, it has better performance
-  --> $DIR/issue-83477.rs:14:13
+  --> $DIR/redundant-path-83477.rs:14:13
    |
 LL |     let _ = std::collections::HashMap::<String, String>::new();
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: a `use rustc_data_structures::fx::FxHashMap` may be necessary
 note: the lint level is defined here
-  --> $DIR/issue-83477.rs:3:9
+  --> $DIR/redundant-path-83477.rs:3:9
    |
 LL | #![warn(rustc::internal)]
    |         ^^^^^^^^^^^^^^^

tests/ui/lint/not_found.rs → tests/ui/lint/unknown-lints/suggestions.rs

@@ -16,6 +16,9 @@
 //~^ WARNING unknown lint
 //~| HELP did you mean
 
+#[deny(rust_2018_idiots)] //~ WARNING unknown lint
+                           //~| HELP did you mean
+
 fn main() {
     unimplemented!();
 }

tests/ui/lint/not_found.stderr → tests/ui/lint/unknown-lints/suggestions.stderr

@@ -1,22 +1,28 @@
 warning: unknown lint: `FOO_BAR`
-  --> $DIR/not_found.rs:6:9
+  --> $DIR/suggestions.rs:6:9
    |
 LL | #[allow(FOO_BAR)]
    |         ^^^^^^^
    |
    = note: `#[warn(unknown_lints)]` on by default
 
 warning: unknown lint: `DEAD_CODE`
-  --> $DIR/not_found.rs:10:8
+  --> $DIR/suggestions.rs:10:8
    |
 LL | #[warn(DEAD_CODE)]
    |        ^^^^^^^^^ help: did you mean: `dead_code`
 
 warning: unknown lint: `Warnings`
-  --> $DIR/not_found.rs:15:8
+  --> $DIR/suggestions.rs:15:8
    |
 LL | #[deny(Warnings)]
    |        ^^^^^^^^ help: did you mean (notice the capitalization): `warnings`
 
-warning: 3 warnings emitted
+warning: unknown lint: `rust_2018_idiots`
+  --> $DIR/suggestions.rs:19:8
+   |
+LL | #[deny(rust_2018_idiots)]
+   |        ^^^^^^^^^^^^^^^^ help: did you mean: `rust_2018_idioms`
+
+warning: 4 warnings emitted