diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 735598fd436..fd2a328f2fd 100644
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -1895,11 +1895,13 @@ impl<'a> LoweringContext<'a> {
                 GenericParam::Lifetime(ref lifetime_def) => {
                     hir::GenericParam::Lifetime(self.lower_lifetime_def(lifetime_def))
                 }
-                GenericParam::Type(ref ty_param) => hir::GenericParam::Type(self.lower_ty_param(
-                    ty_param,
-                    add_bounds.get(&ty_param.id).map_or(&[][..], |x| &x),
-                    itctx,
-                )),
+                GenericParam::Type(ref ty_param) => {
+                    hir::GenericParam::Type(self.lower_ty_param(
+                        ty_param,
+                        add_bounds.get(&ty_param.id).map_or(&[][..], |x| &x),
+                        itctx,
+                    ))
+                }
             })
             .collect()
     }
diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs
index 3943c30127d..2dc46f5f69d 100644
--- a/src/librustc/hir/print.rs
+++ b/src/librustc/hir/print.rs
@@ -2043,7 +2043,10 @@ impl<'a> State<'a> {
         Ok(())
     }
 
-    pub fn print_generic_params(&mut self, generic_params: &[hir::GenericParam]) -> io::Result<()> {
+    pub fn print_generic_params(&mut self,
+                                generic_params: &[hir::GenericParam])
+                                -> io::Result<()>
+    {
         if !generic_params.is_empty() {
             self.s.word("<")?;
 
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index 40d59d3ff8b..3f9e0b9fbb5 100644
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -72,7 +72,9 @@ pub trait Visitor<'ast>: Sized {
     fn visit_expr(&mut self, ex: &'ast Expr) { walk_expr(self, ex) }
     fn visit_expr_post(&mut self, _ex: &'ast Expr) { }
     fn visit_ty(&mut self, t: &'ast Ty) { walk_ty(self, t) }
-    fn visit_generic_param(&mut self, param: &'ast GenericParam) { walk_generic_param(self, param) }
+    fn visit_generic_param(&mut self, param: &'ast GenericParam) {
+        walk_generic_param(self, param)
+    }
     fn visit_generics(&mut self, g: &'ast Generics) { walk_generics(self, g) }
     fn visit_where_predicate(&mut self, p: &'ast WherePredicate) {
         walk_where_predicate(self, p)
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs
index 80f65957c39..ddf3ae41faa 100644
--- a/src/libsyntax_ext/deriving/generic/mod.rs
+++ b/src/libsyntax_ext/deriving/generic/mod.rs
@@ -570,7 +570,11 @@ impl<'a> TraitDef<'a> {
                         bounds.push((*declared_bound).clone());
                     }
 
-                    GenericParam::Type(cx.typaram(self.span, ty_param.ident, vec![], bounds, None))
+                    GenericParam::Type(cx.typaram(self.span,
+                                                  ty_param.ident,
+                                                  vec![],
+                                                  bounds,
+                                                  None))
                 }
             }
         }));
diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs
index 25a29694488..76950a546cf 100644
--- a/src/libsyntax_ext/deriving/generic/ty.rs
+++ b/src/libsyntax_ext/deriving/generic/ty.rs
@@ -187,7 +187,9 @@ impl<'a> Ty<'a> {
                 let self_params = self_generics.params
                     .iter()
                     .filter_map(|param| match *param {
-                        GenericParam::Type(ref ty_param) => Some(cx.ty_ident(span, ty_param.ident)),
+                        GenericParam::Type(ref ty_param) => {
+                            Some(cx.ty_ident(span, ty_param.ident))
+                        }
                         _ => None,
                     })
                     .collect();
@@ -270,7 +272,10 @@ impl<'a> LifetimeBounds<'a> {
                 let bounds = bounds.iter()
                     .map(|b| cx.lifetime(span, Ident::from_str(b)))
                     .collect();
-                GenericParam::Lifetime(cx.lifetime_def(span, Ident::from_str(lt), vec![], bounds))
+                GenericParam::Lifetime(cx.lifetime_def(span,
+                                       Ident::from_str(lt),
+                                       vec![],
+                                       bounds))
             })
             .chain(self.bounds
                 .iter()