auto merge of #11370 : alexcrichton/rust/issue-10465, r=pwalton

Turned out to be a 2-line fix, but the compiler fallout was huge.

src/libsyntax/ext/deriving/mod.rs

@@ -21,7 +21,6 @@ library.
 use ast::{enum_def, Ident, item, Generics, struct_def};
 use ast::{MetaItem, MetaList, MetaNameValue, MetaWord};
 use ext::base::ExtCtxt;
-use ext::build::AstBuilder;
 use codemap::Span;
 
 pub mod clone;

src/libsyntax/ext/expand.rs

@@ -1109,6 +1109,7 @@ mod test {
     use codemap;
     use codemap::Spanned;
     use fold;
+    use fold::*;
     use parse;
     use parse::token::{fresh_mark, gensym, intern, ident_to_str};
     use parse::token;