Test fixes and rebase conflicts, round 1

Author: alexcrichton

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")]

src/librustdoc/clean/mod.rs

@@ -2392,7 +2392,7 @@ fn resolve_type(cx: &DocContext,
     };
 
     match def {
-        def::DefSelfTy(..) => {
+        def::DefSelfTy(..) if path.segments.len() == 1 => {
             return Generic(token::get_name(special_idents::type_self.name).to_string());
         }
         def::DefPrimTy(p) => match p {
@@ -2412,7 +2412,9 @@ fn resolve_type(cx: &DocContext,
             ast::TyFloat(ast::TyF32) => return Primitive(F32),
             ast::TyFloat(ast::TyF64) => return Primitive(F64),
         },
-        def::DefTyParam(_, _, _, n) => return Generic(token::get_name(n).to_string()),
+        def::DefTyParam(_, _, _, n) => {
+            return Generic(token::get_name(n).to_string())
+        }
         _ => {}
     };
     let did = register_def(&*cx, def);