Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ManuallyDrop::new -> forget where possible #1527

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/run-pass/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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;
Expand Down Expand Up @@ -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())) };
}
}

Expand Down