From 0304e15e5c39654346e827c2bb25ca41ed310c86 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 1 Apr 2015 14:04:20 -0700
Subject: Test fixes and rebase conflicts, round 1

---
 src/liballoc/arc.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/liballoc')

diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index 73d109f3c8d..f87c450eda5 100644
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -252,11 +252,14 @@ pub fn strong_count<T>(this: &Arc<T>) -> usize { this.inner().strong.load(SeqCst
 ///
 /// ```
 /// # #![feature(alloc)]
-/// use std::alloc::arc;
+/// extern crate alloc;
+/// # fn main() {
+/// use alloc::arc;
 ///
 /// let mut four = arc::Arc::new(4);
 ///
 /// arc::unique(&mut four).map(|num| *num = 5);
+/// # }
 /// ```
 #[inline]
 #[unstable(feature = "alloc")]
-- 
cgit 1.4.1-3-g733a5