From 32bb1de047b1b59fbb74093cd6ed97611f083495 Mon Sep 17 00:00:00 2001 From: Scott McMurray Date: Wed, 26 Aug 2020 14:19:56 -0700 Subject: [PATCH] Make the tests pass after rust#75912 I don't know if this is actually the fix, but it seems like the only thing if my change actually caused the toolstate break. --- tests/run-pass/generator.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/run-pass/generator.rs b/tests/run-pass/generator.rs index 18eaf5e55c..433c2b7a26 100644 --- a/tests/run-pass/generator.rs +++ b/tests/run-pass/generator.rs @@ -4,7 +4,7 @@ use std::ops::{GeneratorState::{self, *}, Generator}; use std::pin::Pin; use std::sync::atomic::{AtomicUsize, Ordering}; use std::fmt::Debug; -use std::mem::ManuallyDrop; +use std::mem::forget; use std::ptr; fn basic() { @@ -16,7 +16,7 @@ fn basic() { loop { let state = t.as_mut().resume(()); // Test if the generator is valid (according to type invariants). - let _ = unsafe { ManuallyDrop::new(ptr::read(t.as_mut().get_unchecked_mut())) }; + unsafe { forget(ptr::read(t.as_mut().get_unchecked_mut())) }; match state { GeneratorState::Yielded(y) => { amt -= y; @@ -117,7 +117,7 @@ fn smoke_resume_arg() { for (input, out) in inout { assert_eq!(gen.as_mut().resume(input), out); // Test if the generator is valid (according to type invariants). - let _ = unsafe { ManuallyDrop::new(ptr::read(gen.as_mut().get_unchecked_mut())) }; + unsafe { forget(ptr::read(gen.as_mut().get_unchecked_mut())) }; } }