Move /src/test to /tests

20 files changed, 0 insertions, 383 deletions

diff --git a/src/test/ui/diagnostic-width/flag-human.rs b/src/test/ui/diagnostic-width/flag-human.rs
deleted file mode 100644
index 289bfbabd94..00000000000
--- a/src/test/ui/diagnostic-width/flag-human.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: --diagnostic-width=20
-
-// This test checks that `-Z output-width` effects the human error output by restricting it to an
-// arbitrarily low value so that the effect is visible.
-
-fn main() {
-    let _: () = 42;
-    //~^ ERROR mismatched types
-}
diff --git a/src/test/ui/diagnostic-width/flag-human.stderr b/src/test/ui/diagnostic-width/flag-human.stderr
deleted file mode 100644
index 393dcf2b828..00000000000
--- a/src/test/ui/diagnostic-width/flag-human.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/flag-human.rs:7:17
-   |
-LL | ..._: () = 42;
-   |       --   ^^ expected `()`, found integer
-   |       |
-   |       expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/diagnostic-width/flag-json.rs b/src/test/ui/diagnostic-width/flag-json.rs
deleted file mode 100644
index 51a1fb447c7..00000000000
--- a/src/test/ui/diagnostic-width/flag-json.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: --diagnostic-width=20 --error-format=json
-
-// This test checks that `-Z output-width` effects the JSON error output by restricting it to an
-// arbitrarily low value so that the effect is visible.
-
-fn main() {
-    let _: () = 42;
-    //~^ ERROR arguments to this function are incorrect
-}
diff --git a/src/test/ui/diagnostic-width/flag-json.stderr b/src/test/ui/diagnostic-width/flag-json.stderr
deleted file mode 100644
index b21391d1640..00000000000
--- a/src/test/ui/diagnostic-width/flag-json.stderr
+++ /dev/null
@@ -1,40 +0,0 @@
-{"message":"mismatched types","code":{"code":"E0308","explanation":"Expected type did not match the received type.
-
-Erroneous code examples:
-
-```compile_fail,E0308
-fn plus_one(x: i32) -> i32 {
-    x + 1
-}
-
-plus_one(\"Not a number\");
-//       ^^^^^^^^^^^^^^ expected `i32`, found `&str`
-
-if \"Not a bool\" {
-// ^^^^^^^^^^^^ expected `bool`, found `&str`
-}
-
-let x: f32 = \"Not a float\";
-//     ---   ^^^^^^^^^^^^^ expected `f32`, found `&str`
-//     |
-//     expected due to this
-```
-
-This error occurs when an expression was used in a place where the compiler
-expected an expression of a different type. It can occur in several cases, the
-most common being when calling a function and passing an argument which has a
-different type than the matching type in the function declaration.
-"},"level":"error","spans":[{"file_name":"$DIR/flag-json.rs","byte_start":243,"byte_end":245,"line_start":7,"line_end":7,"column_start":17,"column_end":19,"is_primary":true,"text":[{"text":"    let _: () = 42;","highlight_start":17,"highlight_end":19}],"label":"expected `()`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"$DIR/flag-json.rs","byte_start":238,"byte_end":240,"line_start":7,"line_end":7,"column_start":12,"column_end":14,"is_primary":false,"text":[{"text":"    let _: () = 42;","highlight_start":12,"highlight_end":14}],"label":"expected due to this","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0308]: mismatched types
-  --> $DIR/flag-json.rs:7:17
-   |
-LL | ..._: () = 42;
-   |       --   ^^ expected `()`, found integer
-   |       |
-   |       expected due to this
-
-"}
-{"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error
-
-"}
-{"message":"For more information about this error, try `rustc --explain E0308`.","code":null,"level":"failure-note","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0308`.
-"}
diff --git a/src/test/ui/diagnostic-width/long-E0308.rs b/src/test/ui/diagnostic-width/long-E0308.rs
deleted file mode 100644
index f021f102933..00000000000
--- a/src/test/ui/diagnostic-width/long-E0308.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-// compile-flags: --diagnostic-width=60
-// normalize-stderr-test: "long-type-\d+" -> "long-type-hash"
-
-mod a {
-    // Force the "short path for unique types" machinery to trip up
-    pub struct Atype;
-    pub struct Btype;
-    pub struct Ctype;
-}
-
-mod b {
-    pub struct Atype<T, K>(T, K);
-    pub struct Btype<T, K>(T, K);
-    pub struct Ctype<T, K>(T, K);
-}
-
-use b::*;
-
-fn main() {
-    let x: Atype<
-      Btype<
-        Ctype<
-          Atype<
-            Btype<
-              Ctype<
-                Atype<
-                  Btype<
-                    Ctype<i32, i32>,
-                    i32
-                  >,
-                  i32
-                >,
-                i32
-              >,
-              i32
-            >,
-            i32
-          >,
-          i32
-        >,
-        i32
-      >,
-      i32
-    > = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(
-        Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(
-            Ok("")
-        ))))))))))))))))))))))))))))))
-    ))))))))))))))))))))))))))))));
-    //~^^^^^ ERROR E0308
-
-    let _ = Some(Ok(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(
-        Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(
-            Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(Some(
-                Some(Some(Some(Some(Some(Some(Some(Some(Some("")))))))))
-            )))))))))))))))))
-        ))))))))))))))))))
-    ))))))))))))))))) == Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(
-        Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(
-            Ok(Ok(Ok(Ok(Ok(Ok(Ok("")))))))
-        ))))))))))))))))))))))))))))))
-    ))))))))))))))))))))))));
-    //~^^^^^ ERROR E0308
-
-    let x: Atype<
-      Btype<
-        Ctype<
-          Atype<
-            Btype<
-              Ctype<
-                Atype<
-                  Btype<
-                    Ctype<i32, i32>,
-                    i32
-                  >,
-                  i32
-                >,
-                i32
-              >,
-              i32
-            >,
-            i32
-          >,
-          i32
-        >,
-        i32
-      >,
-      i32
-    > = ();
-    //~^ ERROR E0308
-
-    let _: () = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(
-        Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(
-            Ok(Ok(Ok(Ok(Ok(Ok(Ok("")))))))
-        ))))))))))))))))))))))))))))))
-    ))))))))))))))))))))))));
-    //~^^^^^ ERROR E0308
-}
diff --git a/src/test/ui/diagnostic-width/long-E0308.stderr b/src/test/ui/diagnostic-width/long-E0308.stderr
deleted file mode 100644
index 1c99898bc83..00000000000
--- a/src/test/ui/diagnostic-width/long-E0308.stderr
+++ /dev/null
@@ -1,80 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:44:9
-   |
-LL |        let x: Atype<
-   |  _____________-
-LL | |        Btype<
-LL | |          Ctype<
-LL | |            Atype<
-...  |
-LL | |        i32
-LL | |      > = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok...
-   | | _____-___^
-   | ||_____|
-   |  |     expected due to this
-LL |  |         Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok...
-LL |  |             Ok("")
-LL |  |         ))))))))))))))))))))))))))))))
-LL |  |     ))))))))))))))))))))))))))))));
-   |  |__________________________________^ expected struct `Atype`, found enum `Result`
-   |
-   = note: expected struct `Atype<Btype<..., ...>, ...>`
-           the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
-                found enum `Result<Result<..., ...>, ...>`
-           the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
-
-error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:57:26
-   |
-LL |       ))))))))))))))))) == Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(O...
-   |  __________________________^
-LL | |         Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(...
-LL | |             Ok(Ok(Ok(Ok(Ok(Ok(Ok("")))))))
-LL | |         ))))))))))))))))))))))))))))))
-LL | |     ))))))))))))))))))))))));
-   | |____________________________^ expected enum `Option`, found enum `Result`
-   |
-   = note: expected enum `Option<Result<..., ...>>`
-           the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
-              found enum `Result<Result<..., ...>, ...>`
-           the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
-
-error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:88:9
-   |
-LL |       let x: Atype<
-   |  ____________-
-LL | |       Btype<
-LL | |         Ctype<
-LL | |           Atype<
-...  |
-LL | |       i32
-LL | |     > = ();
-   | |     -   ^^ expected struct `Atype`, found `()`
-   | |_____|
-   |       expected due to this
-   |
-   = note: expected struct `Atype<Btype<..., ...>, ...>`
-           the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
-           found unit type `()`
-
-error[E0308]: mismatched types
-  --> $DIR/long-E0308.rs:91:17
-   |
-LL |       let _: () = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(O...
-   |  ____________--___^
-   | |            |
-   | |            expected due to this
-LL | |         Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(...
-LL | |             Ok(Ok(Ok(Ok(Ok(Ok(Ok("")))))))
-LL | |         ))))))))))))))))))))))))))))))
-LL | |     ))))))))))))))))))))))));
-   | |____________________________^ expected `()`, found enum `Result`
-   |
-   = note: expected unit type `()`
-                   found enum `Result<Result<..., ...>, ...>`
-           the full type name has been written to '$TEST_BUILD_DIR/diagnostic-width/long-E0308/long-E0308.long-type-hash.txt'
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.rs b/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.rs
deleted file mode 100644
index 1989ea88635..00000000000
--- a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let unicode_is_fun = "؁‱ஹ௸௵꧄.ဪ꧅⸻𒈙𒐫﷽𒌄𒈟𒍼𒁎𒀱𒌧𒅃 𒈓𒍙𒊎𒄡𒅌𒁏𒀰𒐪𒐩𒈙𒐫𪚥";
-    let _ = "ༀ༁༂༃༄༅༆༇༈༉༊་༌།༎༏༐༑༒༓༔༕༖༗༘༙༚༛༜༝༞༟༠༡༢༣༤༥༦༧༨༩༪༫༬༭༮༯༰༱༲༳༴༵༶༷༸༹༺༻༼༽༾༿ཀཁགགྷངཅཆཇ཈ཉཊཋཌཌྷཎཏཐདདྷནཔཕབབྷམཙཚཛཛྷཝཞཟའཡརལཤཥསཧཨཀྵཪཫཬ཭཮཯཰ཱཱཱིིུུྲྀཷླྀཹེཻོཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇࿈࿉࿊࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun + " really fun!";
-    //~^ ERROR cannot add `&str` to `&str`
-}
diff --git a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.stderr b/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.stderr
deleted file mode 100644
index bf277362dba..00000000000
--- a/src/test/ui/diagnostic-width/non-1-width-unicode-multiline-label.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0369]: cannot add `&str` to `&str`
-  --> $DIR/non-1-width-unicode-multiline-label.rs:5:260
-   |
-LL | ...ཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇...࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun + " really fun!";
-   |                                                  -------------- ^ -------------- &str
-   |                                                  |              |
-   |                                                  |              `+` cannot be used to concatenate two `&str` strings
-   |                                                  &str
-   |
-   = note: string concatenation requires an owned `String` on the left
-help: create an owned `String` from a string reference
-   |
-LL |     let _ = "ༀ༁༂༃༄༅༆༇༈༉༊་༌།༎༏༐༑༒༓༔༕༖༗༘༙༚༛༜༝༞༟༠༡༢༣༤༥༦༧༨༩༪༫༬༭༮༯༰༱༲༳༴༵༶༷༸༹༺༻༼༽༾༿ཀཁགགྷངཅཆཇ཈ཉཊཋཌཌྷཎཏཐདདྷནཔཕབབྷམཙཚཛཛྷཝཞཟའཡརལཤཥསཧཨཀྵཪཫཬ཭཮཯཰ཱཱཱིིུུྲྀཷླྀཹེཻོཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇࿈࿉࿊࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun.to_owned() + " really fun!";
-   |                                                                                                                                                                                         +++++++++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.rs b/src/test/ui/diagnostic-width/non-whitespace-trimming-2.rs
deleted file mode 100644
index abd9e189a75..00000000000
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let _: usize = 4; let _: usize = 5; let _: usize = 6; let _: usize = 7; let _: usize = 8; let _: usize = 9; let _: usize = 10; let _: usize = 11; let _: usize = 12; let _: usize = 13; let _: usize = 14; let _: usize = 15; let _: () = 42; let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let _: usize = 4; let _: usize = 5; let _: usize = 6; let _: usize = 7; let _: usize = 8; let _: usize = 9; let _: usize = 10; let _: usize = 11; let _: usize = 12; let _: usize = 13; let _: usize = 14; let _: usize = 15;
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.stderr b/src/test/ui/diagnostic-width/non-whitespace-trimming-2.stderr
deleted file mode 100644
index 5dbb9ce45ee..00000000000
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-2.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/non-whitespace-trimming-2.rs:4:311
-   |
-LL | ...13; let _: usize = 14; let _: usize = 15; let _: () = 42; let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let ...
-   |                                                     --   ^^ expected `()`, found integer
-   |                                                     |
-   |                                                     expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.rs b/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.rs
deleted file mode 100644
index 8d4d1b16279..00000000000
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀🦀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4"; let _: () = 42;  let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀🦀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4";
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.stderr b/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.stderr
deleted file mode 100644
index 1e5ff939832..00000000000
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming-unicode.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/non-whitespace-trimming-unicode.rs:4:415
-   |
-LL | ...♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4"; let _: () = 42;  let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄...
-   |                                            --   ^^ expected `()`, found integer
-   |                                            |
-   |                                            expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming.rs b/src/test/ui/diagnostic-width/non-whitespace-trimming.rs
deleted file mode 100644
index f6c8d345c65..00000000000
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = 42; let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = ();
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/diagnostic-width/non-whitespace-trimming.stderr b/src/test/ui/diagnostic-width/non-whitespace-trimming.stderr
deleted file mode 100644
index c4ff0e16890..00000000000
--- a/src/test/ui/diagnostic-width/non-whitespace-trimming.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/non-whitespace-trimming.rs:4:241
-   |
-LL | ... () = (); let _: () = (); let _: () = (); let _: () = 42; let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = ...
-   |                                                     --   ^^ expected `()`, found integer
-   |                                                     |
-   |                                                     expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/diagnostic-width/tabs-trimming.rs b/src/test/ui/diagnostic-width/tabs-trimming.rs
deleted file mode 100644
index ade21753b45..00000000000
--- a/src/test/ui/diagnostic-width/tabs-trimming.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Test for #78438: ensure underline alignment with many tabs on the left, long line on the right
-
-// ignore-tidy-linelength
-// ignore-tidy-tab
-
-					fn main() {
-						let money = 42i32;
-						match money {
-							v @ 1 | 2 | 3 => panic!("You gave me too little money {}", v), // Long text here: TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
-							//~^ ERROR variable `v` is not bound in all patterns
-							v => println!("Enough money {}", v),
-						}
-					}
diff --git a/src/test/ui/diagnostic-width/tabs-trimming.stderr b/src/test/ui/diagnostic-width/tabs-trimming.stderr
deleted file mode 100644
index 6c8d9afc73b..00000000000
--- a/src/test/ui/diagnostic-width/tabs-trimming.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0408]: variable `v` is not bound in all patterns
-  --> $DIR/tabs-trimming.rs:9:16
-   |
-LL | ...   v @ 1 | 2 | 3 => panic!("You gave me too little money {}", v), // Long text here: TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT...
-   |       -       ^   ^ pattern doesn't bind `v`
-   |       |       |
-   |       |       pattern doesn't bind `v`
-   |       variable not in all patterns
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming-2.rs b/src/test/ui/diagnostic-width/whitespace-trimming-2.rs
deleted file mode 100644
index c68f678aab3..00000000000
--- a/src/test/ui/diagnostic-width/whitespace-trimming-2.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// ignore-tidy-linelength
-
-fn foo() -> usize {
-                                                                                                                                                                                          ()
-//~^ ERROR mismatched types
-}
-
-fn main() {}
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming-2.stderr b/src/test/ui/diagnostic-width/whitespace-trimming-2.stderr
deleted file mode 100644
index 97a64e603b7..00000000000
--- a/src/test/ui/diagnostic-width/whitespace-trimming-2.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/whitespace-trimming-2.rs:4:187
-   |
-LL | ...-> usize {
-   |       ----- expected `usize` because of return type
-LL | ...                                                                                                                                                                                 ()
-   |                                                                                                                                                                                     ^^ expected `usize`, found `()`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming.rs b/src/test/ui/diagnostic-width/whitespace-trimming.rs
deleted file mode 100644
index f747bcf17e0..00000000000
--- a/src/test/ui/diagnostic-width/whitespace-trimming.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-                                                                                                                                                                                    let _: () = 42;
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/diagnostic-width/whitespace-trimming.stderr b/src/test/ui/diagnostic-width/whitespace-trimming.stderr
deleted file mode 100644
index e296d48893c..00000000000
--- a/src/test/ui/diagnostic-width/whitespace-trimming.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/whitespace-trimming.rs:4:193
-   |
-LL | ...                   let _: () = 42;
-   |                              --   ^^ expected `()`, found integer
-   |                              |
-   |                              expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.