Skip to content

Commit

Permalink
Rollup merge of rust-lang#70038 - DutchGhost:const-forget-tests, r=Ra…
Browse files Browse the repository at this point in the history
…lfJung

Remove the call that makes miri fail

Fixes the concern raised in https://github.com/rust-lang/rust/pull/69645/files#r392884274

cc @RalfJung
  • Loading branch information
Dylan-DPC committed Mar 20, 2020
2 parents 0bd02f7 + d6f3a43 commit d30217c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 18 deletions.
18 changes: 0 additions & 18 deletions src/libcore/tests/mem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,21 +129,3 @@ fn test_discriminant_send_sync() {
is_send_sync::<Discriminant<Regular>>();
is_send_sync::<Discriminant<NotSendSync>>();
}

#[test]
fn test_const_forget() {
const _: () = forget(0i32);
const _: () = forget(Vec::<Vec<Box<i32>>>::new());

// Writing this function signature without const-forget
// triggers compiler errors:
// 1) That we use a non-const fn inside a const fn
// 2) without the forget, it complains about the destructor of Box
const fn const_forget_box<T>(x: Box<T>) {
forget(x);
}

// Call the forget_box at runtime,
// as we can't const-construct a box yet.
const_forget_box(Box::new(0i32));
}
22 changes: 22 additions & 0 deletions src/test/ui/consts/const_forget.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// check-pass

#![feature(const_forget)]

use std::mem::forget;

const _: () = forget(0i32);
const _: () = forget(Vec::<Vec<Box<i32>>>::new());

// Writing this function signature without const-forget
// triggers compiler errors:
// 1) That we use a non-const fn inside a const fn
// 2) without the forget, it complains about the destructor of Box
//
// FIXME: this method cannot be called in const-eval yet, as Box isn't
// const constructable
#[allow(unused)]
const fn const_forget_box<T: ?Sized>(b: Box<T>) {
forget(b);
}

fn main() {}

0 comments on commit d30217c

Please sign in to comment.