Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/ui/feature-gates/feature-gate-concat_idents2.stderr b/tests/ui/feature-gates/feature-gate-concat_idents2.stderr
new file mode 100644
index 000000000..8663bc7ca
--- /dev/null
+++ b/tests/ui/feature-gates/feature-gate-concat_idents2.stderr
@@ -0,0 +1,21 @@
+error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` is not stable enough for use and is subject to change
+  --> $DIR/feature-gate-concat_idents2.rs:2:5
+   |
+LL |     concat_idents!(a, b);
+   |     ^^^^^^^^^^^^^
+   |
+   = note: see issue #29599 <https://github.com/rust-lang/rust/issues/29599> for more information
+   = help: add `#![feature(concat_idents)]` to the crate attributes to enable
+
+error[E0425]: cannot find value `ab` in this scope
+  --> $DIR/feature-gate-concat_idents2.rs:2:5
+   |
+LL |     concat_idents!(a, b);
+   |     ^^^^^^^^^^^^^^^^^^^^ not found in this scope
+   |
+   = note: this error originates in the macro `concat_idents` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0425, E0658.
+For more information about an error, try `rustc --explain E0425`.