Merge #362

362: separate generic mod r=therealprof a=burrbull

Adds option `-g` which when enabled store contents of `generic.rs` in separate file.

It's useful for common crates like `stm32f1` where one crate for several `pac`s.

Uses `syn::parse` instead of vector of `quote!`.

Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

Cargo.toml

@@ -40,4 +40,7 @@ inflections = "1.1.0"
 log = { version = "~0.4", features = ["std"] }
 quote = "0.3.15"
 svd-parser = "0.7"
-syn = "0.11.11"
+
+[dependencies.syn]
+version = "0.11.11"
+features = ["full"]

src/generate/device.rs

@@ -1,18 +1,21 @@
-use quote::Tokens;
+use quote::{Tokens, ToTokens};
+use std::fs::File;
+use std::io::Write;
 use crate::svd::Device;
 use syn::Ident;
 
 use crate::errors::*;
 use crate::util::{self, ToSanitizedUpperCase};
 use crate::Target;
 
-use crate::generate::{interrupt, peripheral, generic};
+use crate::generate::{interrupt, peripheral};
 
 /// Whole device generation
 pub fn render(
     d: &Device,
     target: Target,
     nightly: bool,
+    generic_mod: bool,
     device_x: &mut String,
 ) -> Result<Vec<Tokens>> {
     let mut out = vec![];
@@ -136,7 +139,22 @@ pub fn render(
         }
     }
 
-    out.extend(generic::render()?);
+    let generic_file = std::str::from_utf8(include_bytes!("generic.rs")).unwrap();
+    if generic_mod {
+        writeln!(File::create("generic.rs").unwrap(), "{}", generic_file).unwrap();
+    } else {
+        let mut tokens = Tokens::new();
+        (syn::parse_crate(generic_file)?).to_tokens(&mut tokens);
+
+        out.push(quote! {
+            #[allow(unused_imports)]
+            use generic::*;
+            ///Common register and bit access and modify traits
+            pub mod generic {
+                #tokens
+            }
+        });
+    }
 
     for p in &d.peripherals {
         if target == Target::CortexM && core_peripherals.contains(&&*p.name.to_uppercase()) {