diff options
| author | bors <bors@rust-lang.org> | 2022-03-10 18:28:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-10 18:28:45 +0000 |
| commit | 5f4e0677190b82e61dc507e3e72caf89da8e5e28 (patch) | |
| tree | 50fa030a791eae1815194f2d6631c6ec08888de2 /library/alloc/src | |
| parent | ba14a836c7038da21f5e102aacc7e6d5964f79a6 (diff) | |
| parent | 07e4fbde5a3c0e4972e056ff0ddf48c1aa743123 (diff) | |
| download | rust-5f4e0677190b82e61dc507e3e72caf89da8e5e28.tar.gz rust-5f4e0677190b82e61dc507e3e72caf89da8e5e28.zip | |
Auto merge of #94814 - matthiaskrgr:rollup-a5sk366, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #94440 (Better error for normalization errors from parent crates that use `#![feature(generic_const_exprs)]`) - #94587 (Document new recommended use of `FromIterator::from_iter`) - #94644 (Fix soundness issue in scoped threads.) - #94740 (Unify impl blocks by wrapping them into a div) - #94753 (Improve rustdoc book) - #94796 (Allow `cargo run` instead of `cargo run -p bootstrap`) - #94805 (Revert accidental stabilization) - #94809 (RustWrapper: add missing include) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/boxed.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/library/alloc/src/boxed.rs b/library/alloc/src/boxed.rs index 68bf59a01b3..f753189c683 100644 --- a/library/alloc/src/boxed.rs +++ b/library/alloc/src/boxed.rs @@ -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. } |