newtype in types, more generator config, parsing -> parser

1 files changed, 3 insertions, 3 deletions

diff --git a/src/config.rs b/src/config.rs
index 72a9ff6..942dfcf 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2,7 +2,7 @@ use crate::cli::Cli;
 use crate::generator::config::{
     Config as GeneratorConfig, ProvidedConfig as ProvidedGeneratorConfig,
 };
-use crate::parsing::clang::config::{Config as ClangConfig, ProvidedConfig as ProvidedClangConfig};
+use crate::parser::clang::config::{Config as ClangConfig, ProvidedConfig as ProvidedClangConfig};
 
 use anyhow::{anyhow, Context, Result};
 use codemap::CodeMap;
@@ -19,8 +19,8 @@ pub(super) const DEFAULT_PROJECT_CONFIGURATION_FILE_NAME: &str = "poseidoc.toml"
 #[derive(Debug, Clone, Serialize)]
 pub(crate) struct Config {
     pub(crate) name: String,
-    pub(crate) clang: ClangConfig,
     pub(crate) generator: GeneratorConfig,
+    pub(crate) clang: ClangConfig,
 }
 
 impl Default for Config {
@@ -57,7 +57,7 @@ pub(crate) struct ProvidedConfig {
     #[structopt(flatten)]
     #[serde(default)]
     pub(crate) clang: ProvidedClangConfig,
-    #[structopt(skip)]
+    #[structopt(flatten)]
     #[serde(default)]
     pub(crate) generator: ProvidedGeneratorConfig,
 }