add possibility to use config file

Author: burrbull

Cargo.toml

@@ -34,6 +34,7 @@ path = "src/main.rs"
 [dependencies]
 cast = "0.2"
 clap = "2.33"
+clap_conf = "0.1.5"
 env_logger = "~0.7"
 inflections = "1.1"
 log = { version = "~0.4", features = ["std"] }

src/main.rs

@@ -16,6 +16,7 @@ use clap::{App, Arg};
 use crate::util::{build_rs, Config, Target};
 
 fn run() -> Result<()> {
+    use clap_conf::prelude::*;
     use std::io::Read;
 
     let matches =
@@ -28,6 +29,13 @@ fn run() -> Result<()> {
                     .takes_value(true)
                     .value_name("FILE"),
             )
+            .arg(
+                Arg::with_name("config")
+                    .help("Config TOML file")
+                    .short("c")
+                    .takes_value(true)
+                    .value_name("TOML_FILE"),
+            )
             .arg(
                 Arg::with_name("target")
                     .long("target")
@@ -79,11 +87,6 @@ fn run() -> Result<()> {
 
     setup_logging(&matches);
 
-    let target = matches
-        .value_of("target")
-        .map(|s| Target::parse(s))
-        .unwrap_or_else(|| Ok(Target::default()))?;
-
     let xml = &mut String::new();
     match matches.value_of("input") {
         Some(file) => {
@@ -103,15 +106,36 @@ fn run() -> Result<()> {
 
     let device = svd::parse(xml)?;
 
-    let make_mod = matches.is_present("make_mod");
+    let config_filename = matches.value_of("config").unwrap_or("");
+
+    let cfg = with_toml_env(&matches, &[config_filename, "svd2rust.toml"]);
+
+    let target = cfg
+        .grab()
+        .arg("target")
+        .conf("target")
+        .done()
+        .map(|s| Target::parse(&s))
+        .unwrap_or_else(|| Ok(Target::default()))?;
+
+    let nightly =
+        cfg.bool_flag("nightly_features", Filter::Arg) || cfg.bool_flag("nightly", Filter::Conf);
+    let generic_mod =
+        cfg.bool_flag("generic_mod", Filter::Arg) || cfg.bool_flag("generic_mod", Filter::Conf);
+    let make_mod =
+        cfg.bool_flag("make_mod", Filter::Arg) || cfg.bool_flag("make_mod", Filter::Conf);
+    let const_generic =
+        cfg.bool_flag("const_generic", Filter::Arg) || cfg.bool_flag("const_generic", Filter::Conf);
+    let ignore_groups =
+        cfg.bool_flag("ignore_groups", Filter::Arg) || cfg.bool_flag("ignore_groups", Filter::Conf);
 
     let config = Config {
         target,
-        nightly: matches.is_present("nightly_features"),
-        generic_mod: matches.is_present("generic_mod"),
+        nightly,
+        generic_mod,
         make_mod,
-        const_generic: matches.is_present("const_generic"),
-        ignore_groups: matches.is_present("ignore_groups"),
+        const_generic,
+        ignore_groups,
     };
 
     let mut device_x = String::new();

src/util.rs

@@ -13,7 +13,7 @@ pub const BITS_PER_BYTE: u32 = 8;
 /// that are not valid in Rust ident
 const BLACKLIST_CHARS: &[char] = &['(', ')', '[', ']', '/', ' ', '-'];
 
-#[derive(Clone, Copy, PartialEq, Default)]
+#[derive(Clone, Copy, PartialEq, Default, Debug)]
 pub struct Config {
     pub target: Target,
     pub nightly: bool,
@@ -25,7 +25,7 @@ pub struct Config {
 
 #[allow(clippy::upper_case_acronyms)]
 #[allow(non_camel_case_types)]
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq, Debug)]
 pub enum Target {
     CortexM,
     Msp430,