diff options
| -rw-r--r-- | library/alloc/src/boxed.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/mod.rs | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/library/alloc/src/boxed.rs b/library/alloc/src/boxed.rs index ca3bd24a420..05e5d712a27 100644 --- a/library/alloc/src/boxed.rs +++ b/library/alloc/src/boxed.rs @@ -1045,6 +1045,8 @@ impl<T: ?Sized> Box<T> { /// memory problems. For example, a double-free may occur if the /// function is called twice on the same raw pointer. /// + /// The raw pointer must point to a block of memory allocated by the global allocator. + /// /// The safety conditions are described in the [memory layout] section. /// /// # Examples @@ -1148,6 +1150,7 @@ impl<T: ?Sized, A: Allocator> Box<T, A> { /// memory problems. For example, a double-free may occur if the /// function is called twice on the same raw pointer. /// + /// The raw pointer must point to a block of memory allocated by `alloc` /// /// # Examples /// diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index c3a74683cd3..aaee1b08a40 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -825,8 +825,12 @@ impl<'a> Builder<'a> { match kind { Kind::Build => describe!( compile::Std, - compile::Rustc, + // FIXME(#135022): `compile::Assemble` **must** come before `compile::Rustc` after + // `PathSet` also permits prefix-matching, because `compile::Rustc` can consume the + // `"compiler"` path filter first, causing `compile::Assemble` to no longer run when + // the user writes `./x build compiler --stage 0`. compile::Assemble, + compile::Rustc, compile::CodegenBackend, compile::StartupObjects, tool::BuildManifest, |