Rollup merge of rust-lang#71185 - JohnTitor:run-fail, r=petrochenkov

Move tests from `test/run-fail` to UI

Fixes rust-lang#65440
cc rust-lang#65865 rust-lang#65506
r? @nikomatsakis

Author: RalfJung

src/bootstrap/builder.rs

@@ -359,7 +359,6 @@ impl<'a> Builder<'a> {
                 test::Tidy,
                 test::Ui,
                 test::CompileFail,
-                test::RunFail,
                 test::RunPassValgrind,
                 test::MirOpt,
                 test::Codegen,
@@ -370,7 +369,6 @@ impl<'a> Builder<'a> {
                 test::UiFullDeps,
                 test::Rustdoc,
                 test::Pretty,
-                test::RunFailPretty,
                 test::RunPassValgrindPretty,
                 test::Crate,
                 test::CrateLibrustc,

src/bootstrap/mk/Makefile.in

@@ -48,7 +48,6 @@ check:
 	$(Q)$(BOOTSTRAP) test $(BOOTSTRAP_ARGS)
 check-aux:
 	$(Q)$(BOOTSTRAP) test \
-		src/test/run-fail/pretty \
 		src/test/run-pass-valgrind/pretty \
 		$(AUX_ARGS) \
 		$(BOOTSTRAP_ARGS)

src/bootstrap/test.rs

@@ -898,8 +898,6 @@ default_test!(CompileFail {
     suite: "compile-fail"
 });
 
-default_test!(RunFail { path: "src/test/run-fail", mode: "run-fail", suite: "run-fail" });
-
 default_test!(RunPassValgrind {
     path: "src/test/run-pass-valgrind",
     mode: "run-pass-valgrind",
@@ -929,13 +927,6 @@ host_test!(UiFullDeps { path: "src/test/ui-fulldeps", mode: "ui", suite: "ui-ful
 host_test!(Rustdoc { path: "src/test/rustdoc", mode: "rustdoc", suite: "rustdoc" });
 
 host_test!(Pretty { path: "src/test/pretty", mode: "pretty", suite: "pretty" });
-test!(RunFailPretty {
-    path: "src/test/run-fail/pretty",
-    mode: "pretty",
-    suite: "run-fail",
-    default: false,
-    host: true
-});
 test!(RunPassValgrindPretty {
     path: "src/test/run-pass-valgrind/pretty",
     mode: "pretty",

src/test/run-fail/bug-811.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:index out of bounds
+// ignore-emscripten no processes
 
 use std::usize;
 use std::mem::size_of;

src/test/run-fail/overflowing-lsh-1.rs

@@ -1,5 +1,9 @@
 // Test bounds checking for DST raw slices
+
+// run-fail
 // error-pattern:index out of bounds
+// ignore-emscripten no processes
+
 #[allow(unconditional_panic)]
 fn main() {
     let a: *const [_] = &[1, 2, 3];

src/test/run-fail/overflowing-lsh-2.rs

@@ -1,9 +1,11 @@
+// run-fail
 // error-pattern:quux
+// ignore-emscripten no processes
+
 fn foo() -> ! {
     panic!("quux");
 }
 
-#[allow(resolve_trait_on_defaulted_unit)]
 fn main() {
     foo() == foo(); // these types wind up being defaulted to ()
 }

src/test/run-fail/overflowing-lsh-3.rs

@@ -1,8 +1,12 @@
+// run-fail
 // error-pattern:quux
+// ignore-emscripten no processes
+
 fn my_err(s: String) -> ! {
     println!("{}", s);
     panic!("quux");
 }
+
 fn main() {
     3_usize == my_err("bye".to_string());
 }

src/test/run-fail/overflowing-rsh-1.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:panic 1
+// ignore-emscripten no processes
 
 // revisions: migrate mir
 //[mir]compile-flags: -Z borrowck=mir

src/test/run-fail/overflowing-rsh-2.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:oops
+// ignore-emscripten no processes
 
 fn main() {
     let func = || -> ! {

src/test/run-fail/overflowing-rsh-3.rs

@@ -1,6 +1,8 @@
 #![allow(unconditional_panic, const_err)]
 
+// run-fail
 // error-pattern: attempt to divide by zero
+// ignore-emscripten no processes
 
 fn main() {
     let x = &(1 / (1 - 1));

src/test/run-fail/overflowing-rsh-5.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:explicit panic
+// ignore-emscripten no processes
 
 fn f() -> ! {
     panic!()

src/test/run-fail/overflowing-rsh-6.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:generator resumed after panicking
+// ignore-emscripten no processes
 
 // Test that we get the correct message for resuming a panicked generator.
 

src/test/run-fail/panic-macro-any.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:capacity overflow
+// ignore-emscripten no processes
 
 use std::collections::hash_map::HashMap;
 use std::usize;

src/test/run-fail/unwind-unique.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:explicit panic
+// ignore-emscripten no processes
 
 fn f() -> ! {
     panic!()

src/test/run-fail/bounds-check-no-overflow.rs renamed to src/test/ui/array-slice-vec/bounds-check-no-overflow.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:explicit panic
+// ignore-emscripten no processes
 
 fn main() {
     let _x = if false {

src/test/run-fail/dst-raw-slice.rs renamed to src/test/ui/array-slice-vec/dst-raw-slice.rs

@@ -1,4 +1,7 @@
+// run-fail
 // error-pattern:Number is odd
+// ignore-emscripten no processes
+
 fn even(x: usize) -> bool {
     if x < 2 {
         return false;

src/test/run-fail/binop-fail-3.rs renamed to src/test/ui/binop/binop-fail-3.rs

@@ -1,8 +1,12 @@
+// run-fail
 // error-pattern:quux
+// ignore-emscripten no processes
+
 fn my_err(s: String) -> ! {
     println!("{}", s);
     panic!("quux");
 }
+
 fn main() {
     if my_err("bye".to_string()) {
     }

src/test/run-fail/binop-panic.rs renamed to src/test/ui/binop/binop-panic.rs

@@ -1,6 +1,8 @@
 // Issue #7580
 
+// run-fail
 // error-pattern:panic works
+// ignore-emscripten no processes
 
 use std::*;
 

src/test/run-fail/borrowck-local-borrow.rs renamed to src/test/ui/borrowck/borrowck-local-borrow.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:explicit panic
+// ignore-emscripten no processes
 
 pub fn main() {
     panic!();

src/test/run-fail/diverging-closure.rs renamed to src/test/ui/closures/diverging-closure.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:bad input
+// ignore-emscripten no processes
 
 fn main() {
     Some("foo").unwrap_or(panic!("bad input")).to_string();

src/test/run-fail/promoted_div_by_zero.rs renamed to src/test/ui/consts/promoted_div_by_zero.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:stop
+// ignore-emscripten no processes
 
 // #18576
 // Make sure that calling an extern function pointer in an unreachable
@@ -10,4 +12,5 @@ fn main() {
     let pointer = other;
     pointer();
 }
+
 extern "C" fn other() {}

src/test/run-fail/expr-fn-panic.rs renamed to src/test/ui/fn/expr-fn-panic.rs

@@ -1,6 +1,8 @@
 // Regression test for Issue #20971.
 
+// run-fail
 // error-pattern:Hello, world!
+// ignore-emscripten no processes
 
 pub trait Parser {
     type Input;
@@ -12,7 +14,7 @@ impl Parser for () {
     fn parse(&mut self, input: ()) {}
 }
 
-pub fn many() -> Box<Parser<Input = <() as Parser>::Input> + 'static> {
+pub fn many() -> Box<dyn Parser<Input = <() as Parser>::Input> + 'static> {
     panic!("Hello, world!")
 }
 

src/test/run-fail/generator-resume-after-panic.rs renamed to src/test/ui/generator/generator-resume-after-panic.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:panic evaluated
+// ignore-emscripten no processes
 
 #[allow(unused_variables)]
 fn main() {

src/test/run-fail/hashmap-capacity-overflow.rs renamed to src/test/ui/hashmap/hashmap-capacity-overflow.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:panic evaluated
+// ignore-emscripten no processes
 
 #[allow(unused_variables)]
 fn main() {

src/test/ui/hashmap-iter-value-lifetime.nll.stderr renamed to src/test/ui/hashmap/hashmap-iter-value-lifetime.nll.stderr

@@ -1,12 +1,14 @@
+// run-fail
 // error-pattern:explicit panic
+// ignore-emscripten no processes
 
 use std::sync::Arc;
 
-enum e<T> {
-    ee(Arc<T>),
+enum Err<T> {
+    Errr(Arc<T>),
 }
 
-fn foo() -> e<isize> {
+fn foo() -> Err<isize> {
     panic!();
 }
 

src/test/ui/hashmap-iter-value-lifetime.rs renamed to src/test/ui/hashmap/hashmap-iter-value-lifetime.rs

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:index out of bounds
+// ignore-emscripten no processes
 
 use std::mem;
 

src/test/ui/hashmap-iter-value-lifetime.stderr renamed to src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr

@@ -1,4 +1,6 @@
+// run-fail
 // error-pattern:custom message
+// ignore-emscripten no processes
 
 fn main() {
     assert!(false, "custom message");