Skip to content

Commit c911e5f

Browse files
committed
Auto merge of rust-lang#90734 - matthiaskrgr:rollup-e1euotp, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#89561 (Type inference for inline consts) - rust-lang#90035 (implement rfc-2528 type_changing-struct-update) - rust-lang#90613 (Allow to run a specific rustdoc-js* test) - rust-lang#90683 (Make `compiler-docs` only control the default instead of being a hard off-switch) - rust-lang#90685 (x.py: remove fixme by deleting code) - rust-lang#90701 (Record more artifact sizes during self-profiling.) - rust-lang#90723 (Better document `Box` and `alloc::alloc::box_free` connection) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0561856 + 546ea8e commit c911e5f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

alloc/src/boxed.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ use crate::vec::Vec;
169169
#[lang = "owned_box"]
170170
#[fundamental]
171171
#[stable(feature = "rust1", since = "1.0.0")]
172+
// The declaration of the `Box` struct must be kept in sync with the
173+
// `alloc::alloc::box_free` function or ICEs will happen. See the comment
174+
// on `box_free` for more details.
172175
pub struct Box<
173176
T: ?Sized,
174177
#[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global,

0 commit comments

Comments
 (0)