Skip to content

Commit

Permalink
Rollup merge of #94805 - oli-obk:drop_box, r=pnkfelix
Browse files Browse the repository at this point in the history
Revert accidental stabilization

fixes #94804
  • Loading branch information
matthiaskrgr authored Mar 10, 2022
2 parents fa685a5 + 5f7ca55 commit af35dc2
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
3 changes: 1 addition & 2 deletions library/alloc/src/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1170,8 +1170,7 @@ impl<T: ?Sized, A: Allocator> Box<T, A> {
}

#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_const_unstable(feature = "const_box", issue = "92521")]
unsafe impl<#[may_dangle] T: ?Sized, A: Allocator> const Drop for Box<T, A> {
unsafe impl<#[may_dangle] T: ?Sized, A: Allocator> Drop for Box<T, A> {
fn drop(&mut self) {
// FIXME: Do nothing, drop is currently performed by compiler.
}
Expand Down
2 changes: 1 addition & 1 deletion library/alloc/tests/boxed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ fn const_box() {
*boxed = 42;
assert!(*boxed == 42);

*boxed
*Box::leak(boxed)
};

assert!(VALUE == 42);
Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/consts/drop_box.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const fn f<T>(_: Box<T>) {}
//~^ ERROR destructors cannot be evaluated at compile-time

fn main() {}
11 changes: 11 additions & 0 deletions src/test/ui/consts/drop_box.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error[E0493]: destructors cannot be evaluated at compile-time
--> $DIR/drop_box.rs:1:15
|
LL | const fn f<T>(_: Box<T>) {}
| ^ - value is dropped here
| |
| constant functions cannot evaluate destructors

error: aborting due to previous error

For more information about this error, try `rustc --explain E0493`.

0 comments on commit af35dc2

Please sign in to comment.