about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-11 07:40:27 +0000
committerbors <bors@rust-lang.org>2015-07-11 07:40:27 +0000
commit1b28ffa5216c845d1cef6b0cb3e5ac7db12025d0 (patch)
tree9c77611c90018f5b88bb00e3e06d23dbd60a4413 /src/liballoc
parentf7f28c8b26af35fb495f60b43d0c6361c587045f (diff)
parent25b14375b752ea88f91af37ec2b5c042cd10927b (diff)
downloadrust-1b28ffa5216c845d1cef6b0cb3e5ac7db12025d0.tar.gz
rust-1b28ffa5216c845d1cef6b0cb3e5ac7db12025d0.zip
Auto merge of #26961 - Manishearth:rollup, r=Manishearth
- Successful merges: #26932, #26936, #26943, #26944
- Failed merges: 
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/boxed.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index c941629b871..3dfd10f0916 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -71,7 +71,7 @@ use core::raw::{TraitObject};
 /// The following two examples are equivalent:
 ///
 /// ```
-/// # #![feature(box_heap)]
+/// #![feature(box_heap)]
 /// #![feature(box_syntax)]
 /// use std::boxed::HEAP;
 ///
@@ -162,7 +162,7 @@ impl<T : ?Sized> Box<T> {
 ///
 /// # Examples
 /// ```
-/// # #![feature(box_raw)]
+/// #![feature(box_raw)]
 /// use std::boxed;
 ///
 /// let seventeen = Box::new(17u32);