Merged migrated compile-fail tests and ui tests. Fixes #46841.

6 files changed, 118 insertions, 0 deletions

diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs
new file mode 100644
index 00000000000..e398f16a065
--- /dev/null
+++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs
@@ -0,0 +1,28 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags:-C panic=abort
+
+#![feature(alloc_error_handler, panic_implementation)]
+#![no_std]
+#![no_main]
+
+use core::alloc::Layout;
+
+#[alloc_error_handler]
+fn oom(
+    info: &Layout, //~ ERROR argument should be `Layout`
+) -> () //~ ERROR return type should be `!`
+{
+    loop {}
+}
+
+#[panic_implementation]
+fn panic(_: &core::panic::PanicInfo) -> ! { loop {} }
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
new file mode 100644
index 00000000000..6dd905ceab4
--- /dev/null
+++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.stderr
@@ -0,0 +1,14 @@
+error: return type should be `!`
+  --> $DIR/alloc-error-handler-bad-signature-1.rs:22:6
+   |
+LL | ) -> () //~ ERROR return type should be `!`
+   |      ^^
+
+error: argument should be `Layout`
+  --> $DIR/alloc-error-handler-bad-signature-1.rs:21:11
+   |
+LL |     info: &Layout, //~ ERROR argument should be `Layout`
+   |           ^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs
new file mode 100644
index 00000000000..4fee9d27e51
--- /dev/null
+++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs
@@ -0,0 +1,27 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags:-C panic=abort
+
+#![feature(alloc_error_handler, panic_implementation)]
+#![no_std]
+#![no_main]
+
+struct Layout;
+
+#[alloc_error_handler]
+fn oom(
+    info: Layout, //~ ERROR argument should be `Layout`
+) { //~ ERROR return type should be `!`
+    loop {}
+}
+
+#[panic_implementation]
+fn panic(_: &core::panic::PanicInfo) -> ! { loop {} }
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr
new file mode 100644
index 00000000000..c1fcdc75833
--- /dev/null
+++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.stderr
@@ -0,0 +1,14 @@
+error: return type should be `!`
+  --> $DIR/alloc-error-handler-bad-signature-2.rs:22:3
+   |
+LL | ) { //~ ERROR return type should be `!`
+   |   ^
+
+error: argument should be `Layout`
+  --> $DIR/alloc-error-handler-bad-signature-2.rs:21:11
+   |
+LL |     info: Layout, //~ ERROR argument should be `Layout`
+   |           ^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs
new file mode 100644
index 00000000000..828a78055d5
--- /dev/null
+++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs
@@ -0,0 +1,25 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags:-C panic=abort
+
+#![feature(alloc_error_handler, panic_implementation)]
+#![no_std]
+#![no_main]
+
+struct Layout;
+
+#[alloc_error_handler]
+fn oom() -> ! { //~ ERROR function should have one argument
+    loop {}
+}
+
+#[panic_implementation]
+fn panic(_: &core::panic::PanicInfo) -> ! { loop {} }
diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr
new file mode 100644
index 00000000000..9b792c46c24
--- /dev/null
+++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.stderr
@@ -0,0 +1,10 @@
+error: function should have one argument
+  --> $DIR/alloc-error-handler-bad-signature-3.rs:20:1
+   |
+LL | / fn oom() -> ! { //~ ERROR function should have one argument
+LL | |     loop {}
+LL | | }
+   | |_^
+
+error: aborting due to previous error
+