Test fixes and rebase conflicts

Author: alexcrichton

src/librustc/middle/stability.rs

@@ -96,7 +96,8 @@ impl<'a> Annotator<'a> {
                 if tag == "unstable" || tag == "stable" || tag == "deprecated" {
                     attr::mark_used(attr);
                     self.sess.span_warn(attr.span(),
-                                        "stability attributes are deprecated and will soon become errors");
+                                        "stability attributes are deprecated \
+                                         and will soon become errors");
                 }
             }
             f(self);

src/libstd/path.rs

@@ -1570,7 +1570,7 @@ impl Path {
     /// # Examples
     ///
     /// ```
-    /// use std::path::Path;
+    /// use std::path::{Path, PathBuf};
     ///
     /// let path = Path::new("/tmp/foo.rs");
     ///

src/libsyntax/print/pprust.rs

@@ -352,7 +352,7 @@ pub fn stmt_to_string(stmt: &ast::Stmt) -> String {
     $to_string(|s| s.print_stmt(stmt))
 }
 
-pub fn attr_to_string(attr: &ast::Attr) -> String {
+pub fn attr_to_string(attr: &ast::Attribute) -> String {
     $to_string(|s| s.print_attribute(attr))
 }