Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 50 deletions

diff --git a/src/test/ui/try-trait/try-poll.rs b/src/test/ui/try-trait/try-poll.rs
deleted file mode 100644
index d42e51c74..000000000
--- a/src/test/ui/try-trait/try-poll.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// build-pass (FIXME(62277): could be check-pass?)
-
-#![allow(dead_code, unused)]
-
-use std::task::Poll;
-
-struct K;
-struct E;
-
-fn as_result() -> Result<(), E> {
-    // From Result
-    let K = Ok::<K, E>(K)?;
-
-    // From Poll<Result>
-    let _: Poll<K> = Poll::Ready::<Result<K, E>>(Ok(K))?;
-
-    // From Poll<Option<Result>>
-    let _: Poll<Option<K>> = Poll::Ready::<Option<Result<K, E>>>(None)?;
-
-    Ok(())
-}
-
-fn as_poll_result() -> Poll<Result<(), E>> {
-    // From Result
-    let K = Ok::<K, E>(K)?;
-
-    // From Poll<Result>
-    let _: Poll<K> = Poll::Ready::<Result<K, E>>(Ok(K))?;
-
-    // From Poll<Option<Result>>
-    let _: Poll<Option<K>> = Poll::Ready::<Option<Result<K, E>>>(None)?;
-
-    Poll::Ready(Ok(()))
-}
-
-fn as_poll_option_result() -> Poll<Option<Result<(), E>>> {
-    // From Result
-    let K = Ok::<K, E>(K)?;
-
-    // From Poll<Result>
-    let _: Poll<K> = Poll::Ready::<Result<K, E>>(Ok(K))?;
-
-    // From Poll<Option<Result>>
-    let _: Poll<Option<K>> = Poll::Ready::<Option<Result<K, E>>>(None)?;
-
-    Poll::Ready(Some(Ok(())))
-}
-
-fn main() {
-}