Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 0 insertions, 123 deletions

diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs b/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
deleted file mode 100644
index ade386a60..000000000
--- a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// issue 65419 - Attempting to run an async fn after completion mentions generators when it should
-// be talking about `async fn`s instead.
-
-// run-fail
-// error-pattern: thread 'main' panicked at '`async fn` resumed after completion'
-// edition:2018
-// ignore-wasm no panic or subprocess support
-// ignore-emscripten no panic or subprocess support
-
-#![feature(generators, generator_trait)]
-
-async fn foo() {
-}
-
-fn main() {
-    let mut future = Box::pin(foo());
-    executor::block_on(future.as_mut());
-    executor::block_on(future.as_mut());
-}
-
-mod executor {
-    use core::{
-        future::Future,
-        pin::Pin,
-        task::{Context, Poll, RawWaker, RawWakerVTable, Waker},
-    };
-
-    pub fn block_on<F: Future>(mut future: F) -> F::Output {
-        let mut future = unsafe { Pin::new_unchecked(&mut future) };
-
-        static VTABLE: RawWakerVTable = RawWakerVTable::new(
-            |_| unimplemented!("clone"),
-            |_| unimplemented!("wake"),
-            |_| unimplemented!("wake_by_ref"),
-            |_| (),
-        );
-        let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
-        let mut context = Context::from_waker(&waker);
-
-        loop {
-            if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
-                break val;
-            }
-        }
-    }
-}
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs b/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
deleted file mode 100644
index b4ea4c9f6..000000000
--- a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// issue 65419 - Attempting to run an async fn after completion mentions generators when it should
-// be talking about `async fn`s instead. Should also test what happens when it panics.
-
-// run-fail
-// needs-unwind
-// error-pattern: thread 'main' panicked at '`async fn` resumed after panicking'
-// edition:2018
-// ignore-wasm no panic or subprocess support
-
-#![feature(generators, generator_trait)]
-
-use std::panic;
-
-async fn foo() {
-    panic!();
-}
-
-fn main() {
-    let mut future = Box::pin(foo());
-    panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        executor::block_on(future.as_mut());
-    }));
-
-    executor::block_on(future.as_mut());
-}
-
-mod executor {
-    use core::{
-        future::Future,
-        pin::Pin,
-        task::{Context, Poll, RawWaker, RawWakerVTable, Waker},
-    };
-
-    pub fn block_on<F: Future>(mut future: F) -> F::Output {
-        let mut future = unsafe { Pin::new_unchecked(&mut future) };
-
-        static VTABLE: RawWakerVTable = RawWakerVTable::new(
-            |_| unimplemented!("clone"),
-            |_| unimplemented!("wake"),
-            |_| unimplemented!("wake_by_ref"),
-            |_| (),
-        );
-        let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
-        let mut context = Context::from_waker(&waker);
-
-        loop {
-            if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
-                break val;
-            }
-        }
-    }
-}
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs b/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
deleted file mode 100644
index 9fc5667d6..000000000
--- a/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// issue 65419 - Attempting to run an `async fn` after completion mentions generators when it should
-// be talking about `async fn`s instead. Regression test added to make sure generators still
-// panic when resumed after completion.
-
-// run-fail
-// error-pattern:generator resumed after completion
-// edition:2018
-// ignore-wasm no panic or subprocess support
-// ignore-emscripten no panic or subprocess support
-
-#![feature(generators, generator_trait)]
-
-use std::{
-    ops::Generator,
-    pin::Pin,
-};
-
-fn main() {
-    let mut g = || {
-        yield;
-    };
-    Pin::new(&mut g).resume(()); // Yields once.
-    Pin::new(&mut g).resume(()); // Completes here.
-    Pin::new(&mut g).resume(()); // Panics here.
-}