diff --git a/.travis.yml b/.travis.yml
index 58035ae5..b07e0e72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ env:
 
 matrix:
   include:
+    # rustfmt
+    - env: TARGET=x86_64-unknown-linux-gnu VENDOR=rustfmt
+      rust: stable
+
     # Nightly, for testing
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Atmel
 
diff --git a/ci/script.sh b/ci/script.sh
index 7558b588..ccb1f55f 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -50,6 +50,11 @@ main() {
         return
     fi
 
+    if [ $VENDOR = rustfmt ]; then
+        cargo fmt --all -- --check
+        return
+    fi
+
     cargo build --target $TARGET --release
 
     case $TRAVIS_OS_NAME in
diff --git a/src/generate/device.rs b/src/generate/device.rs
index 049e4803..14cecb38 100644
--- a/src/generate/device.rs
+++ b/src/generate/device.rs
@@ -1,8 +1,8 @@
+use crate::svd::Device;
+use proc_macro2::{Ident, Span, TokenStream};
 use quote::ToTokens;
-use proc_macro2::{TokenStream, Ident, Span};
 use std::fs::File;
 use std::io::Write;
-use crate::svd::Device;
 
 use crate::errors::*;
 use crate::util::{self, ToSanitizedUpperCase};
@@ -124,8 +124,7 @@ pub fn render(
 
     let core_peripherals: &[_] = if fpu_present {
         &[
-            "CBP", "CPUID", "DCB", "DWT", "FPB", "FPU", "ITM", "MPU", "NVIC", "SCB", "SYST",
-            "TPIU",
+            "CBP", "CPUID", "DCB", "DWT", "FPB", "FPU", "ITM", "MPU", "NVIC", "SCB", "SYST", "TPIU",
         ]
     } else {
         &[
@@ -181,7 +180,12 @@ pub fn render(
             continue;
         }
 
-        out.extend(peripheral::render(p, &d.peripherals, &d.default_register_properties, nightly)?);
+        out.extend(peripheral::render(
+            p,
+            &d.peripherals,
+            &d.default_register_properties,
+            nightly,
+        )?);
 
         if p.registers
             .as_ref()