about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-24 20:42:56 +0000
committerbors <bors@rust-lang.org>2015-09-24 20:42:56 +0000
commit5ca60d94316bd56f412ef4c13292237e206babf1 (patch)
tree87330551f028eabf5e5a480524dcd6880087915f /src/liballoc
parent6a2187414a8c25f485dc788088b4466f595a7dd9 (diff)
parentf293ea28b4beb5821feedc862619ec539f742cc3 (diff)
downloadrust-5ca60d94316bd56f412ef4c13292237e206babf1.tar.gz
rust-5ca60d94316bd56f412ef4c13292237e206babf1.zip
Auto merge of #28608 - eddyb:no-place-for-an-old-box, r=pnkfelix
While this is technically a [breaking-change], there is no excuse for touching `HEAP`.
r? @pnkfelix
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/boxed.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 4293b4765e1..3239677fc0c 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -80,11 +80,10 @@ use core::raw::{TraitObject};
 /// use std::boxed::HEAP;
 ///
 /// fn main() {
-///     let foo = box(HEAP) 5;
+///     let foo: Box<i32> = in HEAP { 5 };
 ///     let foo = box 5;
 /// }
 /// ```
-#[lang = "exchange_heap"]
 #[unstable(feature = "box_heap",
            reason = "may be renamed; uncertain about custom allocator design",
            issue = "27779")]