Test fixes and rebase conflicts

2 files changed, 7 insertions, 5 deletions

diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index fdc3b52c4d3..97b198164eb 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -33,12 +33,15 @@ use core::ops::{Deref, DerefMut};
 /// The following two examples are equivalent:
 ///
 /// ```rust
+/// #![feature(box_syntax)]
 /// use std::boxed::HEAP;
 ///
+/// fn main() {
 /// # struct Bar;
 /// # impl Bar { fn new(_a: int) { } }
-/// let foo = box(HEAP) Bar::new(2);
-/// let foo = box Bar::new(2);
+///     let foo = box(HEAP) Bar::new(2);
+///     let foo = box Bar::new(2);
+/// }
 /// ```
 #[lang = "exchange_heap"]
 #[experimental = "may be renamed; uncertain about custom allocator design"]
@@ -49,10 +52,9 @@ pub static HEAP: () = ();
 #[stable]
 pub struct Box<T>(Unique<T>);
 
-#[unstable]
 impl<T> Box<T> {
     /// Moves `x` into a freshly allocated box on the global exchange heap.
-    #[unstable]
+    #[stable]
     pub fn new(x: T) -> Box<T> {
         box x
     }
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index 439bb6c55dc..02933c763ef 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -125,7 +125,7 @@ const MIN_ALIGN: uint = 8;
           not(feature = "external_crate"),
           any(target_arch = "x86",
               target_arch = "x86_64",
-              target_arch = "aarch64"))]
+              target_arch = "aarch64")))]
 const MIN_ALIGN: uint = 16;
 
 #[cfg(feature = "external_funcs")]