Try #381:

Author: bors[bot]

.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
 

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

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()

src/generate/register.rs

@@ -301,7 +301,6 @@ pub fn fields(
         let pc_r = &f.pc_r;
         let mut pc_w = &f.pc_r;
 
-        let mut base_pc_w = None;
         let mut evs_r = None;
 
         let _pc_r = &f._pc_r;
@@ -338,22 +337,17 @@ pub fn fields(
                     }
                 });
 
-                base_pc_w = base.as_ref().map(|base| {
+                if let Some(base) = base {
                     let pc = base.field.to_sanitized_upper_case();
                     let base_pc_r = Ident::new(&format!("{}_A", pc), Span::call_site());
-                    let base_pc_r =
-                        derive_from_base(mod_items, &base, &pc_r, &base_pc_r, description);
+                    derive_from_base(mod_items, &base, &pc_r, &base_pc_r, description);
 
                     let doc = format!("Reader of field `{}`", f.name);
                     mod_items.push(quote! {
                         #[doc = #doc]
-                        pub type #_pc_r = crate::R<#fty, #base_pc_r>;
+                        pub type #_pc_r = crate::R<#fty, #pc_r>;
                     });
-
-                    base_pc_r
-                });
-
-                if base.is_none() {
+                } else {
                     let has_reserved_variant = evs.values.len() != (1 << f.width);
                     let variants = Variant::from_enumerated_values(evs)?;
 
@@ -474,13 +468,11 @@ pub fn fields(
                 if Some(evs) != evs_r.as_ref() {
                     pc_w = &f.pc_w;
 
-                    base_pc_w = base.as_ref().map(|base| {
+                    if let Some(base) = base {
                         let pc = base.field.to_sanitized_upper_case();
                         let base_pc_w = Ident::new(&format!("{}_AW", pc), Span::call_site());
-                        derive_from_base(mod_items, &base, &pc_w, &base_pc_w, description)
-                    });
-
-                    if base.is_none() {
+                        derive_from_base(mod_items, &base, &pc_w, &base_pc_w, description);
+                    } else {
                         add_from_variants(mod_items, &variants, pc_w, &f, description, rv);
                     }
                 }
@@ -500,23 +492,13 @@ pub fn fields(
                     let sc = &v.sc;
 
                     let doc = util::escape_brackets(util::respace(&v.doc).as_ref());
-                    if let Some(enum_) = base_pc_w.as_ref() {
-                        proxy_items.push(quote! {
-                            #[doc = #doc]
-                            #[inline(always)]
-                            pub fn #sc(self) -> &'a mut W {
-                                self.variant(#enum_::#pc)
-                            }
-                        });
-                    } else {
-                        proxy_items.push(quote! {
-                            #[doc = #doc]
-                            #[inline(always)]
-                            pub fn #sc(self) -> &'a mut W {
-                                self.variant(#pc_w::#pc)
-                            }
-                        });
-                    }
+                    proxy_items.push(quote! {
+                        #[doc = #doc]
+                        #[inline(always)]
+                        pub fn #sc(self) -> &'a mut W {
+                            self.variant(#pc_w::#pc)
+                        }
+                    });
                 }
             }
 
@@ -694,7 +676,7 @@ fn derive_from_base(
     pc: &Ident,
     base_pc: &Ident,
     desc: &str,
-) -> TokenStream {
+) {
     let span = Span::call_site();
     if let (Some(peripheral), Some(register)) = (&base.peripheral, &base.register) {
         let pmod_ = peripheral.to_sanitized_snake_case();
@@ -707,10 +689,6 @@ fn derive_from_base(
             pub type #pc =
                 crate::#pmod_::#rmod_::#base_pc;
         });
-
-        quote! {
-            crate::#pmod_::#rmod_::#base_pc
-        }
     } else if let Some(register) = &base.register {
         let mod_ = register.to_sanitized_snake_case();
         let mod_ = Ident::new(&mod_, span);
@@ -720,19 +698,11 @@ fn derive_from_base(
             pub type #pc =
                 super::#mod_::#base_pc;
         });
-
-        quote! {
-            super::#mod_::#base_pc
-        }
     } else {
         mod_items.push(quote! {
             #[doc = #desc]
             pub type #pc = #base_pc;
         });
-
-        quote! {
-            #base_pc
-        }
     }
 }