Auto merge of #1169 - RalfJung:rustup, r=RalfJung

rustup; fix generator test

Author: bors

rust-version

@@ -1 +1 @@
-333c32a5a4a51cae562c47e0669bc5aeaf741c45
+b5e21dbb5cabdaaadc47a4d8e3f59979dcad2871

tests/compile-fail/generator-pinned-moved.rs

@@ -25,7 +25,7 @@ where
 
     fn next(&mut self) -> Option<Self::Item> {
         let me = unsafe { Pin::new_unchecked(&mut self.0) };
-        match me.resume() {
+        match me.resume(()) {
             GeneratorState::Yielded(x) => Some(x),
             GeneratorState::Complete(_) => None,
         }

tests/run-pass/generator.rs

@@ -1,30 +1,32 @@
 #![feature(generators, generator_trait, never_type)]
 
-use std::ops::{GeneratorState, Generator};
+use std::ops::{GeneratorState::{self, *}, Generator};
 use std::pin::Pin;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::fmt::Debug;
 
-fn finish<T>(mut amt: usize, mut t: T) -> T::Return
-    where T: Generator<Yield = usize>
-{
-    // We are not moving the `t` around until it gets dropped, so this is okay.
-    let mut t = unsafe { Pin::new_unchecked(&mut t) };
-    loop {
-        match t.as_mut().resume() {
-            GeneratorState::Yielded(y) => amt -= y,
-            GeneratorState::Complete(ret) => {
-                assert_eq!(amt, 0);
-                return ret
+fn basic() {
+    fn finish<T>(mut amt: usize, mut t: T) -> T::Return
+        where T: Generator<Yield = usize>
+    {
+        // We are not moving the `t` around until it gets dropped, so this is okay.
+        let mut t = unsafe { Pin::new_unchecked(&mut t) };
+        loop {
+            match t.as_mut().resume(()) {
+                GeneratorState::Yielded(y) => amt -= y,
+                GeneratorState::Complete(ret) => {
+                    assert_eq!(amt, 0);
+                    return ret
+                }
             }
         }
     }
-}
 
-enum Never {}
-fn never() -> Never {
-    panic!()
-}
+    enum Never {}
+    fn never() -> Never {
+        panic!()
+    }
 
-fn main() {
     finish(1, || yield 1);
 
     finish(3, || {
@@ -94,3 +96,93 @@ fn main() {
         let _x: (String, !) = (String::new(), { yield 2; return });
     });
 }
+
+fn smoke_resume_arg() {
+    fn drain<G: Generator<R, Yield = Y> + Unpin, R, Y>(
+        gen: &mut G,
+        inout: Vec<(R, GeneratorState<Y, G::Return>)>,
+    ) where
+        Y: Debug + PartialEq,
+        G::Return: Debug + PartialEq,
+    {
+        let mut gen = Pin::new(gen);
+
+        for (input, out) in inout {
+            assert_eq!(gen.as_mut().resume(input), out);
+        }
+    }
+
+    static DROPS: AtomicUsize = AtomicUsize::new(0);
+
+    #[derive(Debug, PartialEq)]
+    struct DropMe;
+
+    impl Drop for DropMe {
+        fn drop(&mut self) {
+            DROPS.fetch_add(1, Ordering::SeqCst);
+        }
+    }
+
+    fn expect_drops<T>(expected_drops: usize, f: impl FnOnce() -> T) -> T {
+        DROPS.store(0, Ordering::SeqCst);
+
+        let res = f();
+
+        let actual_drops = DROPS.load(Ordering::SeqCst);
+        assert_eq!(actual_drops, expected_drops);
+        res
+    }
+
+    drain(
+        &mut |mut b| {
+            while b != 0 {
+                b = yield (b + 1);
+            }
+            -1
+        },
+        vec![(1, Yielded(2)), (-45, Yielded(-44)), (500, Yielded(501)), (0, Complete(-1))],
+    );
+
+    expect_drops(2, || drain(&mut |a| yield a, vec![(DropMe, Yielded(DropMe))]));
+
+    expect_drops(6, || {
+        drain(
+            &mut |a| yield yield a,
+            vec![(DropMe, Yielded(DropMe)), (DropMe, Yielded(DropMe)), (DropMe, Complete(DropMe))],
+        )
+    });
+
+    #[allow(unreachable_code)]
+    expect_drops(2, || drain(&mut |a| yield return a, vec![(DropMe, Complete(DropMe))]));
+
+    expect_drops(2, || {
+        drain(
+            &mut |a: DropMe| {
+                if false { yield () } else { a }
+            },
+            vec![(DropMe, Complete(DropMe))],
+        )
+    });
+
+    expect_drops(4, || {
+        drain(
+            #[allow(unused_assignments, unused_variables)]
+            &mut |mut a: DropMe| {
+                a = yield;
+                a = yield;
+                a = yield;
+            },
+            vec![
+                (DropMe, Yielded(())),
+                (DropMe, Yielded(())),
+                (DropMe, Yielded(())),
+                (DropMe, Complete(())),
+            ],
+        )
+    });
+}
+
+fn main() {
+    basic();
+    smoke_resume_arg();
+}