Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 33 deletions

diff --git a/src/test/ui/generator/dropck-resume.rs b/src/test/ui/generator/dropck-resume.rs
deleted file mode 100644
index 4c18077f3..000000000
--- a/src/test/ui/generator/dropck-resume.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-#![feature(generators, generator_trait)]
-
-use std::ops::{Generator, GeneratorState};
-use std::pin::Pin;
-
-struct SetToNone<'a: 'b, 'b>(&'b mut Option<&'a i32>);
-
-impl<'a, 'b> Drop for SetToNone<'a, 'b> {
-    fn drop(&mut self) {
-        *self.0 = None;
-    }
-}
-
-fn drop_using_generator() -> i32 {
-    let mut y = Some(&0);
-    let z = &mut y;
-    let r;
-    {
-        let mut g = move |r| {
-            let _s = SetToNone(r);
-            yield;
-        };
-        let mut g = Pin::new(&mut g);
-        g.as_mut().resume(z);
-        r = y.as_ref().unwrap();
-        //~^ ERROR cannot borrow `y` as immutable because it is also borrowed as mutable
-    }
-    **r
-}
-
-fn main() {
-    println!("{}", drop_using_generator());
-}