diff --git a/failure_derive/src/lib.rs b/failure_derive/src/lib.rs
index 7df10d1..0f74dd2 100644
--- a/failure_derive/src/lib.rs
+++ b/failure_derive/src/lib.rs
@@ -6,9 +6,9 @@ extern crate synstructure;
 #[macro_use]
 extern crate quote;
 
-use proc_macro2::{TokenStream, Span};
-use syn::LitStr;
+use proc_macro2::{Span, TokenStream};
 use syn::spanned::Spanned;
+use syn::LitStr;
 
 #[derive(Debug)]
 struct Error(TokenStream);
@@ -106,16 +106,16 @@ fn display_body(s: &synstructure::Structure) -> Result<Option<quote::__rt::Token
 
     let mut tokens = TokenStream::new();
     for v in s.variants() {
-        let msg =
-            find_error_msg(&v.ast().attrs)?
-              .ok_or_else(|| Error::new(
-                  v.ast().ident.span(),
-                  "All variants must have display attribute."
-              ))?;
+        let msg = find_error_msg(&v.ast().attrs)?.ok_or_else(|| {
+            Error::new(
+                v.ast().ident.span(),
+                "All variants must have display attribute.",
+            )
+        })?;
         if msg.nested.is_empty() {
             return Err(Error::new(
                 msg.span(),
-                "Expected at least one argument to fail attribute"
+                "Expected at least one argument to fail attribute",
             ));
         }
 
@@ -126,7 +126,7 @@ fn display_body(s: &synstructure::Structure) -> Result<Option<quote::__rt::Token
             _ => {
                 return Err(Error::new(
                     msg.span(),
-                    "Fail attribute must begin `display = \"\"` to control the Display message."
+                    "Fail attribute must begin `display = \"\"` to control the Display message.",
                 ));
             }
         };
@@ -146,13 +146,13 @@ fn display_body(s: &synstructure::Structure) -> Result<Option<quote::__rt::Token
                                     arg.span(),
                                     &format!(
                                         "display attempted to access field `{}` in `{}::{}` which \
-                                     does not exist (there are {} field{})",
+                                         does not exist (there are {} field{})",
                                         idx,
                                         s.ast().ident,
                                         v.ast().ident,
                                         v.bindings().len(),
                                         if v.bindings().len() != 1 { "s" } else { "" }
-                                    )
+                                    ),
                                 ));
                             }
                         };
@@ -171,15 +171,15 @@ fn display_body(s: &synstructure::Structure) -> Result<Option<quote::__rt::Token
                         id,
                         s.ast().ident,
                         v.ast().ident
-                    )
+                    ),
                 ));
             }
             ref arg => {
                 return Err(Error::new(
                     arg.span(),
-                    "Invalid argument to fail attribute!"
+                    "Invalid argument to fail attribute!",
                 ));
-            },
+            }
         });
         let args = args.collect::<Result<Vec<_>, _>>()?;
 
@@ -197,7 +197,7 @@ fn find_error_msg(attrs: &[syn::Attribute]) -> Result<Option<syn::MetaList>, Err
                 if error_msg.is_some() {
                     return Err(Error::new(
                         meta.span(),
-                        "Cannot have two display attributes"
+                        "Cannot have two display attributes",
                     ));
                 } else {
                     if let syn::Meta::List(list) = meta {
@@ -205,7 +205,7 @@ fn find_error_msg(attrs: &[syn::Attribute]) -> Result<Option<syn::MetaList>, Err
                     } else {
                         return Err(Error::new(
                             meta.span(),
-                            "fail attribute must take a list in parentheses"
+                            "fail attribute must take a list in parentheses",
                         ));
                     }
                 }
diff --git a/failure_derive/tests/wraps.rs b/failure_derive/tests/wraps.rs
index 2049273..c3afbf5 100644
--- a/failure_derive/tests/wraps.rs
+++ b/failure_derive/tests/wraps.rs
@@ -59,7 +59,10 @@ fn wrap_backtrace_error() {
         .is_some());
     assert!(err.backtrace().is_some());
     assert!(err.backtrace().is_empty());
-    assert_eq!(err.backtrace().is_empty(), err.backtrace().to_string().trim().is_empty());
+    assert_eq!(
+        err.backtrace().is_empty(),
+        err.backtrace().to_string().trim().is_empty()
+    );
 }
 
 #[derive(Fail, Debug)]
@@ -94,5 +97,8 @@ fn wrap_enum_error() {
         .is_some());
     assert!(err.backtrace().is_some());
     assert!(err.backtrace().is_empty());
-    assert_eq!(err.backtrace().is_empty(), err.backtrace().to_string().trim().is_empty());
+    assert_eq!(
+        err.backtrace().is_empty(),
+        err.backtrace().to_string().trim().is_empty()
+    );
 }
diff --git a/src/lib.rs b/src/lib.rs
index 02c239f..287858e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -107,10 +107,10 @@ with_std! {
 /// `Fail` by a blanket impl.
 pub trait Fail: Display + Debug + Send + Sync + 'static {
     /// Returns the "name" of the error.
-    /// 
+    ///
     /// This is typically the type name. Not all errors will implement
     /// this. This method is expected to be most useful in situations
-    /// where errors need to be reported to external instrumentation systems 
+    /// where errors need to be reported to external instrumentation systems
     /// such as crash reporters.
     fn name(&self) -> Option<&str> {
         None
diff --git a/tests/basic_fail.rs b/tests/basic_fail.rs
index 574886d..d85e334 100644
--- a/tests/basic_fail.rs
+++ b/tests/basic_fail.rs
@@ -18,4 +18,4 @@ fn test_name() {
 
     assert_eq!(ctx.to_string(), "whatever");
     assert_eq!(ctx.name(), Some("basic_fail::MyError"));
-}
\ No newline at end of file
+}
diff --git a/tests/macro_trailing_comma.rs b/tests/macro_trailing_comma.rs
index 012d006..99d9355 100644
--- a/tests/macro_trailing_comma.rs
+++ b/tests/macro_trailing_comma.rs
@@ -27,41 +27,47 @@ macro_rules! wrap_early_return {
 fn bail() {
     assert_eq!(
         wrap_early_return!(bail!("test")),
-        wrap_early_return!(bail!("test",)));
+        wrap_early_return!(bail!("test",))
+    );
     assert_eq!(
         wrap_early_return!(bail!("test {}", 4)),
-        wrap_early_return!(bail!("test {}", 4,)));
+        wrap_early_return!(bail!("test {}", 4,))
+    );
 }
 
 #[test]
 fn ensure() {
     assert_eq!(
         wrap_early_return!(ensure!(false, "test")),
-        wrap_early_return!(ensure!(false, "test",)));
+        wrap_early_return!(ensure!(false, "test",))
+    );
     assert_eq!(
         wrap_early_return!(ensure!(false, "test {}", 4)),
-        wrap_early_return!(ensure!(false, "test {}", 4,)));
+        wrap_early_return!(ensure!(false, "test {}", 4,))
+    );
 }
 
 #[test]
 fn single_arg_ensure() {
-    assert_eq!(
-        wrap_early_return!(ensure!(false)),
-        Err("false".to_string()));
+    assert_eq!(wrap_early_return!(ensure!(false)), Err("false".to_string()));
     assert_eq!(
         wrap_early_return!(ensure!(true == false)),
-        Err("true == false".to_string()));
+        Err("true == false".to_string())
+    );
     assert_eq!(
         wrap_early_return!(ensure!(4 == 5)),
-        Err("4 == 5".to_string()));
+        Err("4 == 5".to_string())
+    );
 }
 
 #[test]
 fn format_err() {
     assert_eq!(
         format_err!("test").to_string(),
-        format_err!("test",).to_string());
+        format_err!("test",).to_string()
+    );
     assert_eq!(
         format_err!("test {}", 4).to_string(),
-        format_err!("test {}", 4,).to_string());
+        format_err!("test {}", 4,).to_string()
+    );
 }