serde-default, option output_dir

Author: burrbull

src/config.rs

@@ -2,84 +2,32 @@ use anyhow::{bail, Result};
 use std::path::{Path, PathBuf};
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]
-#[derive(Clone, PartialEq, Eq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug, Default)]
+#[cfg_attr(feature = "serde", serde(default))]
 pub struct Config {
-    #[cfg_attr(feature = "serde", serde(default))]
     pub target: Target,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub atomics: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub atomics_feature: Option<String>,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub generic_mod: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub make_mod: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub ignore_groups: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub keep_list: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub strict: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub pascal_enum_values: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub feature_group: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub feature_peripheral: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub max_cluster_size: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub impl_debug: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub impl_debug_feature: Option<String>,
-    #[cfg_attr(feature = "serde", serde(default = "current_dir"))]
-    pub output_dir: PathBuf,
-    #[cfg_attr(feature = "serde", serde(default))]
+    pub output_dir: Option<PathBuf>,
     pub input: Option<PathBuf>,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub source_type: SourceType,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub log_level: Option<String>,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub interrupt_link_section: Option<String>,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub reexport_core_peripherals: bool,
-    #[cfg_attr(feature = "serde", serde(default))]
     pub reexport_interrupt: bool,
 }
 
-fn current_dir() -> PathBuf {
-    PathBuf::from(".")
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            target: Target::default(),
-            atomics: false,
-            atomics_feature: None,
-            generic_mod: false,
-            make_mod: false,
-            ignore_groups: false,
-            keep_list: false,
-            strict: false,
-            pascal_enum_values: false,
-            feature_group: false,
-            feature_peripheral: false,
-            max_cluster_size: false,
-            impl_debug: false,
-            impl_debug_feature: None,
-            output_dir: current_dir(),
-            input: None,
-            source_type: SourceType::default(),
-            log_level: None,
-            interrupt_link_section: None,
-            reexport_core_peripherals: false,
-            reexport_interrupt: false,
-        }
-    }
-}
-
 #[allow(clippy::upper_case_acronyms)]
 #[allow(non_camel_case_types)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize))]

src/generate/device.rs

@@ -6,6 +6,7 @@ use log::debug;
 use std::borrow::Cow;
 use std::fs::File;
 use std::io::Write;
+use std::path::Path;
 
 use crate::config::{Config, Target};
 use crate::util::{self, ToSanitizedCase};
@@ -139,7 +140,13 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
     let generic_file = include_str!("generic.rs");
     let generic_atomic_file = include_str!("generic_atomic.rs");
     if config.generic_mod {
-        let mut file = File::create(config.output_dir.join("generic.rs"))?;
+        let mut file = File::create(
+            config
+                .output_dir
+                .as_deref()
+                .unwrap_or(Path::new("."))
+                .join("generic.rs"),
+        )?;
         writeln!(file, "{generic_file}")?;
         if config.atomics {
             if let Some(atomics_feature) = config.atomics_feature.as_ref() {

src/main.rs

@@ -2,9 +2,9 @@
 
 use log::{debug, error, info};
 
-use std::fs::File;
 use std::io::Write;
 use std::process;
+use std::{fs::File, path::Path};
 
 use anyhow::{Context, Result};
 use clap::{Arg, ArgAction, Command};
@@ -217,7 +217,7 @@ fn run() -> Result<()> {
     if let Some(file) = config.input.as_ref() {
         config.source_type = SourceType::from_path(file)
     }
-    let path = &config.output_dir;
+    let path = config.output_dir.as_deref().unwrap_or(Path::new("."));
 
     info!("Parsing device from SVD file");
     let device = load_from(input, &config)?;