From 6b855573bd488cc11efb1f8cf1eeaf0f51327776 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 30 Jan 2019 11:51:06 +0100 Subject: [PATCH 1/2] fix generator test case --- tests/run-pass/generator.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/run-pass/generator.rs b/tests/run-pass/generator.rs index 603093a037c..c9c114aaccc 100644 --- a/tests/run-pass/generator.rs +++ b/tests/run-pass/generator.rs @@ -11,12 +11,15 @@ #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; +use std::pin::Pin; fn finish(mut amt: usize, mut t: T) -> T::Return where T: Generator { + // 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 unsafe { t.resume() } { + match t.as_mut().resume() { GeneratorState::Yielded(y) => amt -= y, GeneratorState::Complete(ret) => { assert_eq!(amt, 0); From e827f7b2383adddaced2a9af404455224d7be6c0 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 30 Jan 2019 11:51:17 +0100 Subject: [PATCH 2/2] bump Rust --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 452bb5c2b97..0c7f4692212 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2019-01-28 +nightly-2019-01-30