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/consts/const-extern-fn/feature-gate-const_extern_fn.stderr b/tests/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
new file mode 100644
index 000000000..f8c3107bd
--- /dev/null
+++ b/tests/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
@@ -0,0 +1,21 @@
+error[E0658]: `cdecl` as a `const fn` ABI is unstable
+  --> $DIR/feature-gate-const_extern_fn.rs:7:14
+   |
+LL | const extern "cdecl" fn foo4() {}
+   |              ^^^^^^^
+   |
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
+   = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
+
+error[E0658]: `cdecl` as a `const fn` ABI is unstable
+  --> $DIR/feature-gate-const_extern_fn.rs:11:21
+   |
+LL | const unsafe extern "cdecl" fn bar4() {}
+   |                     ^^^^^^^
+   |
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
+   = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0658`.