From 45f6744fdac14196378c0d2f28c48d27024d9589 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 7 Feb 2020 14:19:58 +0100 Subject: [PATCH] panics dont work on Windows, just the smoke test should be enough --- tests/run-pass/generator.rs | 27 --------------------------- tests/run-pass/generator.stderr | 1 - 2 files changed, 28 deletions(-) delete mode 100644 tests/run-pass/generator.stderr diff --git a/tests/run-pass/generator.rs b/tests/run-pass/generator.rs index a7c72ed3530c..e85d2cf8f29a 100644 --- a/tests/run-pass/generator.rs +++ b/tests/run-pass/generator.rs @@ -1,6 +1,5 @@ #![feature(generators, generator_trait, never_type)] -use std::panic::{catch_unwind, AssertUnwindSafe}; use std::ops::{GeneratorState::{self, *}, Generator}; use std::pin::Pin; use std::sync::atomic::{AtomicUsize, Ordering}; @@ -183,33 +182,7 @@ fn smoke_resume_arg() { }); } -fn panic_drop_resume() { - static DROP: AtomicUsize = AtomicUsize::new(0); - - struct Dropper {} - - impl Drop for Dropper { - fn drop(&mut self) { - DROP.fetch_add(1, Ordering::SeqCst); - } - } - - let mut gen = |_arg| { - if true { - panic!(); - } - yield (); - }; - let mut gen = Pin::new(&mut gen); - - assert_eq!(DROP.load(Ordering::Acquire), 0); - let res = catch_unwind(AssertUnwindSafe(|| gen.as_mut().resume(Dropper {}))); - assert!(res.is_err()); - assert_eq!(DROP.load(Ordering::Acquire), 1); -} - fn main() { basic(); smoke_resume_arg(); - panic_drop_resume(); } diff --git a/tests/run-pass/generator.stderr b/tests/run-pass/generator.stderr deleted file mode 100644 index 17f385d4d695..000000000000 --- a/tests/run-pass/generator.stderr +++ /dev/null @@ -1 +0,0 @@ -thread 'main' panicked at 'explicit panic', $DIR/generator.rs:199:13