Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/ui/consts/const-try-feature-gate.rs b/tests/ui/consts/const-try-feature-gate.rs
new file mode 100644
index 000000000..0839c23a0
--- /dev/null
+++ b/tests/ui/consts/const-try-feature-gate.rs
@@ -0,0 +1,9 @@
+// gate-test-const_try
+
+const fn t() -> Option<()> {
+    Some(())?;
+    //~^ error: `?` is not allowed in a `const fn`
+    None
+}
+
+fn main() {}