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

4 files changed, 51 insertions, 0 deletions

diff --git a/src/test/ui/reserved/reserved-attr-on-macro.rs b/src/test/ui/reserved/reserved-attr-on-macro.rs
new file mode 100644
index 00000000000..db8f82a70e1
--- /dev/null
+++ b/src/test/ui/reserved/reserved-attr-on-macro.rs
@@ -0,0 +1,18 @@
+// Copyright 2015 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.
+
+#[rustc_attribute_should_be_reserved] //~ ERROR attributes with the prefix `rustc_` are reserved
+macro_rules! foo {
+    () => (());
+}
+
+fn main() {
+    foo!();
+}
diff --git a/src/test/ui/reserved/reserved-attr-on-macro.stderr b/src/test/ui/reserved/reserved-attr-on-macro.stderr
new file mode 100644
index 00000000000..e8bfcc04f48
--- /dev/null
+++ b/src/test/ui/reserved/reserved-attr-on-macro.stderr
@@ -0,0 +1,11 @@
+error[E0658]: unless otherwise specified, attributes with the prefix `rustc_` are reserved for internal compiler diagnostics (see issue #29642)
+  --> $DIR/reserved-attr-on-macro.rs:11:1
+   |
+LL | #[rustc_attribute_should_be_reserved] //~ ERROR attributes with the prefix `rustc_` are reserved
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = help: add #![feature(rustc_attrs)] to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/reserved/reserved-become.rs b/src/test/ui/reserved/reserved-become.rs
new file mode 100644
index 00000000000..bcda61e363d
--- /dev/null
+++ b/src/test/ui/reserved/reserved-become.rs
@@ -0,0 +1,14 @@
+// Copyright 2012-2015 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.
+
+fn main() {
+    let become = 0;
+    //~^ ERROR expected pattern, found reserved keyword `become`
+}
diff --git a/src/test/ui/reserved/reserved-become.stderr b/src/test/ui/reserved/reserved-become.stderr
new file mode 100644
index 00000000000..fa9a9601208
--- /dev/null
+++ b/src/test/ui/reserved/reserved-become.stderr
@@ -0,0 +1,8 @@
+error: expected pattern, found reserved keyword `become`
+  --> $DIR/reserved-become.rs:12:9
+   |
+LL |     let become = 0;
+   |         ^^^^^^ expected pattern
+
+error: aborting due to previous error
+