diff options
Diffstat (limited to 'src/config.rs')
-rw-r--r-- | src/config.rs | 6 |
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; | |||
2 | use crate::generator::config::{ | 2 | use crate::generator::config::{ |
3 | Config as GeneratorConfig, ProvidedConfig as ProvidedGeneratorConfig, | 3 | Config as GeneratorConfig, ProvidedConfig as ProvidedGeneratorConfig, |
4 | }; | 4 | }; |
5 | use crate::parsing::clang::config::{Config as ClangConfig, ProvidedConfig as ProvidedClangConfig}; | 5 | use crate::parser::clang::config::{Config as ClangConfig, ProvidedConfig as ProvidedClangConfig}; |
6 | 6 | ||
7 | use anyhow::{anyhow, Context, Result}; | 7 | use anyhow::{anyhow, Context, Result}; |
8 | use codemap::CodeMap; | 8 | use codemap::CodeMap; |
@@ -19,8 +19,8 @@ pub(super) const DEFAULT_PROJECT_CONFIGURATION_FILE_NAME: &str = "poseidoc.toml" | |||
19 | #[derive(Debug, Clone, Serialize)] | 19 | #[derive(Debug, Clone, Serialize)] |
20 | pub(crate) struct Config { | 20 | pub(crate) struct Config { |
21 | pub(crate) name: String, | 21 | pub(crate) name: String, |
22 | pub(crate) clang: ClangConfig, | ||
23 | pub(crate) generator: GeneratorConfig, | 22 | pub(crate) generator: GeneratorConfig, |
23 | pub(crate) clang: ClangConfig, | ||
24 | } | 24 | } |
25 | 25 | ||
26 | impl Default for Config { | 26 | impl Default for Config { |
@@ -57,7 +57,7 @@ pub(crate) struct ProvidedConfig { | |||
57 | #[structopt(flatten)] | 57 | #[structopt(flatten)] |
58 | #[serde(default)] | 58 | #[serde(default)] |
59 | pub(crate) clang: ProvidedClangConfig, | 59 | pub(crate) clang: ProvidedClangConfig, |
60 | #[structopt(skip)] | 60 | #[structopt(flatten)] |
61 | #[serde(default)] | 61 | #[serde(default)] |
62 | pub(crate) generator: ProvidedGeneratorConfig, | 62 | pub(crate) generator: ProvidedGeneratorConfig, |
63 | } | 63 | } |