diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 980493973d545..59452d3040e8f 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -27,8 +27,7 @@ use syntax::ext::expand::Expansion;
 use syntax::ext::hygiene::Mark;
 use syntax::ext::tt::macro_rules;
 use syntax::feature_gate::{emit_feature_err, GateIssue};
-use syntax::fold::Folder;
-use syntax::fold;
+use syntax::fold::{self, Folder};
 use syntax::ptr::P;
 use syntax::util::lev_distance::find_best_match_for_name;
 use syntax::visit::Visitor;
diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs
index 811aea4a9eb7e..64ec460a52460 100644
--- a/src/libsyntax_ext/deriving/custom.rs
+++ b/src/libsyntax_ext/deriving/custom.rs
@@ -29,8 +29,7 @@ impl<'a> Visitor<'a> for MarkAttrs<'a> {
         }
     }
 
-    fn visit_mac(&mut self, _mac: &Mac) {
-    }
+    fn visit_mac(&mut self, _mac: &Mac) {}
 }
 
 pub struct CustomDerive {
diff --git a/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs b/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs
index 68da011e5a5bb..818308b05a44e 100644
--- a/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs
@@ -25,5 +25,4 @@ struct S {
     x: int!(),
 }
 
-fn main() {
-}
+fn main() {}