fix

Author: burrbull

CHANGELOG.md

@@ -10,11 +10,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 - Option `-o`(`--output-path`) let you specify output directory path
-- Option `ignore_groups` for optional disabling #506
 
 ### Changed
 
 - options can be set now with `svd2rust.toml` config
+- option `ignore_groups` for optional disabling #506
 - [breaking-change] move `const_generic` from features to options
 - use `Config` to pass options over all render levels
 - Use register iterator from `svd-parser`

src/generate/device.rs

@@ -3,7 +3,6 @@ use proc_macro2::{Ident, Span, TokenStream};
 use quote::{quote, ToTokens};
 use std::fs::File;
 use std::io::Write;
-use std::path::Path;
 
 use crate::util::{self, Config, ToSanitizedUpperCase};
 use crate::Target;
@@ -12,12 +11,7 @@ use anyhow::Result;
 use crate::generate::{interrupt, peripheral};
 
 /// Whole device generation
-pub fn render(
-    d: &Device,
-    config: &Config,
-    device_x: &mut String,
-    path: impl AsRef<Path>,
-) -> Result<TokenStream> {
+pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<TokenStream> {
     let mut out = TokenStream::new();
 
     let commit_info = {
@@ -146,7 +140,7 @@ pub fn render(
     let generic_file = std::str::from_utf8(include_bytes!("generic.rs"))?;
     if config.generic_mod {
         writeln!(
-            File::create(&path.as_ref().join("generic.rs"))?,
+            File::create(config.output_dir.join("generic.rs"))?,
             "{}",
             generic_file
         )?;

src/lib.rs

@@ -516,7 +516,7 @@ pub fn generate(xml: &str, config: &Config) -> Result<Generation> {
     let device = svd::parse(xml)?;
     let mut device_x = String::new();
     let items =
-        generate::device::render(&device, &config, &mut device_x, ".").or(Err(SvdError::Render))?;
+        generate::device::render(&device, &config, &mut device_x).or(Err(SvdError::Render))?;
 
     let mut lib_rs = String::new();
     writeln!(

src/main.rs

@@ -148,20 +148,21 @@ fn run() -> Result<()> {
         make_mod,
         const_generic,
         ignore_groups,
+        output_dir: path.clone(),
     };
 
     let mut device_x = String::new();
-    let items = generate::device::render(&device, &config, &mut device_x, &path)?;
+    let items = generate::device::render(&device, &config, &mut device_x)?;
     let filename = if make_mod { "mod.rs" } else { "lib.rs" };
-    let mut file = File::create(&path.join(filename)).expect("Couldn't create output file");
+    let mut file = File::create(path.join(filename)).expect("Couldn't create output file");
 
     let data = items.to_string().replace("] ", "]\n");
     file.write_all(data.as_ref())
         .expect("Could not write code to lib.rs");
 
     if target == Target::CortexM || target == Target::Msp430 || target == Target::XtensaLX {
-        writeln!(File::create(&path.join("device.x"))?, "{}", device_x)?;
-        writeln!(File::create(&path.join("build.rs"))?, "{}", build_rs())?;
+        writeln!(File::create(path.join("device.x"))?, "{}", device_x)?;
+        writeln!(File::create(path.join("build.rs"))?, "{}", build_rs())?;
     }
 
     Ok(())

src/util.rs

@@ -4,6 +4,7 @@ use crate::svd::{Access, Cluster, Register, RegisterCluster, RegisterInfo};
 use inflections::Inflect;
 use proc_macro2::{Ident, Literal, Span, TokenStream};
 use quote::{quote, ToTokens};
+use std::path::PathBuf;
 
 use anyhow::{anyhow, bail, Result};
 
@@ -13,14 +14,29 @@ pub const BITS_PER_BYTE: u32 = 8;
 /// that are not valid in Rust ident
 const BLACKLIST_CHARS: &[char] = &['(', ')', '[', ']', '/', ' ', '-'];
 
-#[derive(Clone, Copy, PartialEq, Default, Debug)]
+#[derive(Clone, PartialEq, Debug)]
 pub struct Config {
     pub target: Target,
     pub nightly: bool,
     pub generic_mod: bool,
     pub make_mod: bool,
     pub const_generic: bool,
     pub ignore_groups: bool,
+    pub output_dir: PathBuf,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            target: Target::default(),
+            nightly: false,
+            generic_mod: false,
+            make_mod: false,
+            const_generic: false,
+            ignore_groups: false,
+            output_dir: PathBuf::from("."),
+        }
+    }
 }
 
 #[allow(clippy::upper_case_acronyms)]