]> git.lizzy.rs Git - rust.git/commitdiff
Moved tests and fixed merge conflict
authorDavid Haig <david@ninjasource.com>
Thu, 28 Nov 2019 08:24:19 +0000 (08:24 +0000)
committerDavid Haig <david@ninjasource.com>
Thu, 28 Nov 2019 08:24:19 +0000 (08:24 +0000)
src/librustc_mir/shim.rs
src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs [new file with mode: 0644]
src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs [new file with mode: 0644]
src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs [new file with mode: 0644]
src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs [deleted file]
src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs [deleted file]
src/test/ui/issues/issue-65419/issue-65419-generator-resume-after-completion.rs [deleted file]

index 8300033bca7ef21008590b5be0e31e61297a6369..08af271ff46e06fd024e6512a7b88dbe59507e65 100644 (file)
@@ -253,7 +253,6 @@ fn new_body<'tcx>(
         basic_blocks,
         source_scopes,
         ClearCrossCrate::Clear,
-        None,
         local_decls,
         IndexVec::new(),
         arg_count,
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
new file mode 100644 (file)
index 0000000..0cb6aa0
--- /dev/null
@@ -0,0 +1,44 @@
+// 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
+
+#![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
new file mode 100644 (file)
index 0000000..da252de
--- /dev/null
@@ -0,0 +1,50 @@
+// 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
+// error-pattern: thread 'main' panicked at '`async fn` resumed after panicking'
+// edition:2018
+
+#![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
new file mode 100644 (file)
index 0000000..2d4d9bc
--- /dev/null
@@ -0,0 +1,23 @@
+// 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
+
+#![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.
+}
diff --git a/src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs b/src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
deleted file mode 100644 (file)
index 54df1a5..0000000
+++ /dev/null
@@ -1,44 +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'
-// compile-flags: --edition 2018
-
-#![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/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs b/src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
deleted file mode 100644 (file)
index d2845fd..0000000
+++ /dev/null
@@ -1,50 +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
-// error-pattern: thread 'main' panicked at '`async fn` resumed after panicking'
-// compile-flags: --edition 2018
-
-#![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/issues/issue-65419/issue-65419-generator-resume-after-completion.rs b/src/test/ui/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
deleted file mode 100644 (file)
index 456c1d3..0000000
+++ /dev/null
@@ -1,22 +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
-
-#![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.
-}