Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 39 deletions

diff --git a/src/test/ui/consts/const-try.rs b/src/test/ui/consts/const-try.rs
deleted file mode 100644
index e199fd9ff..000000000
--- a/src/test/ui/consts/const-try.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// check-pass
-
-// Demonstrates what's needed to make use of `?` in const contexts.
-
-#![crate_type = "lib"]
-#![feature(try_trait_v2)]
-#![feature(const_trait_impl)]
-#![feature(const_try)]
-
-use std::ops::{ControlFlow, FromResidual, Try};
-
-struct TryMe;
-struct Error;
-
-impl const FromResidual<Error> for TryMe {
-    fn from_residual(residual: Error) -> Self {
-        TryMe
-    }
-}
-
-impl const Try for TryMe {
-    type Output = ();
-    type Residual = Error;
-    fn from_output(output: Self::Output) -> Self {
-        TryMe
-    }
-    fn branch(self) -> ControlFlow<Self::Residual, Self::Output> {
-        ControlFlow::Break(Error)
-    }
-}
-
-const fn t() -> TryMe {
-    TryMe?;
-    TryMe
-}
-
-const _: () = {
-    t();
-};