Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 45 deletions

diff --git a/src/test/ui/generator/resume-live-across-yield.rs b/src/test/ui/generator/resume-live-across-yield.rs
deleted file mode 100644
index 4c4cf117a..000000000
--- a/src/test/ui/generator/resume-live-across-yield.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-// run-pass
-
-#![feature(generators, generator_trait)]
-
-use std::ops::{Generator, GeneratorState};
-use std::pin::Pin;
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-static DROP: AtomicUsize = AtomicUsize::new(0);
-
-#[derive(PartialEq, Eq, Debug)]
-struct Dropper(String);
-
-impl Drop for Dropper {
-    fn drop(&mut self) {
-        DROP.fetch_add(1, Ordering::SeqCst);
-    }
-}
-
-fn main() {
-    let mut g = |mut _d| {
-        _d = yield;
-        _d
-    };
-
-    let mut g = Pin::new(&mut g);
-
-    assert_eq!(
-        g.as_mut().resume(Dropper(String::from("Hello world!"))),
-        GeneratorState::Yielded(())
-    );
-    assert_eq!(DROP.load(Ordering::Acquire), 0);
-    match g.as_mut().resume(Dropper(String::from("Number Two"))) {
-        GeneratorState::Complete(dropper) => {
-            assert_eq!(DROP.load(Ordering::Acquire), 1);
-            assert_eq!(dropper.0, "Number Two");
-            drop(dropper);
-            assert_eq!(DROP.load(Ordering::Acquire), 2);
-        }
-        _ => unreachable!(),
-    }
-
-    drop(g);
-    assert_eq!(DROP.load(Ordering::Acquire), 2);
-}