Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 50 insertions, 0 deletions

diff --git a/tests/ui/reserved/reserved-attr-on-macro.rs b/tests/ui/reserved/reserved-attr-on-macro.rs
new file mode 100644
index 000000000..2630db0d0
--- /dev/null
+++ b/tests/ui/reserved/reserved-attr-on-macro.rs
@@ -0,0 +1,11 @@
+#[rustc_attribute_should_be_reserved]
+//~^ ERROR cannot find attribute `rustc_attribute_should_be_reserved` in this scope
+//~| ERROR attributes starting with `rustc` are reserved for use by the `rustc` compiler
+
+macro_rules! foo {
+    () => (());
+}
+
+fn main() {
+    foo!(); //~ ERROR cannot determine resolution for the macro `foo`
+}
diff --git a/tests/ui/reserved/reserved-attr-on-macro.stderr b/tests/ui/reserved/reserved-attr-on-macro.stderr
new file mode 100644
index 000000000..e55b58bef
--- /dev/null
+++ b/tests/ui/reserved/reserved-attr-on-macro.stderr
@@ -0,0 +1,22 @@
+error: attributes starting with `rustc` are reserved for use by the `rustc` compiler
+  --> $DIR/reserved-attr-on-macro.rs:1:3
+   |
+LL | #[rustc_attribute_should_be_reserved]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: cannot determine resolution for the macro `foo`
+  --> $DIR/reserved-attr-on-macro.rs:10:5
+   |
+LL |     foo!();
+   |     ^^^
+   |
+   = note: import resolution is stuck, try simplifying macro imports
+
+error: cannot find attribute `rustc_attribute_should_be_reserved` in this scope
+  --> $DIR/reserved-attr-on-macro.rs:1:3
+   |
+LL | #[rustc_attribute_should_be_reserved]
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
diff --git a/tests/ui/reserved/reserved-become.rs b/tests/ui/reserved/reserved-become.rs
new file mode 100644
index 000000000..56645255e
--- /dev/null
+++ b/tests/ui/reserved/reserved-become.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let become = 0;
+    //~^ ERROR expected identifier, found reserved keyword `become`
+}
diff --git a/tests/ui/reserved/reserved-become.stderr b/tests/ui/reserved/reserved-become.stderr
new file mode 100644
index 000000000..0703b76d6
--- /dev/null
+++ b/tests/ui/reserved/reserved-become.stderr
@@ -0,0 +1,13 @@
+error: expected identifier, found reserved keyword `become`
+  --> $DIR/reserved-become.rs:2:9
+   |
+LL |     let become = 0;
+   |         ^^^^^^ expected identifier, found reserved keyword
+   |
+help: escape `become` to use it as an identifier
+   |
+LL |     let r#become = 0;
+   |         ++
+
+error: aborting due to previous error
+