Flatten some structures.
clippy Build clippy has failed Details
rust-foreign-document-test Build rust-foreign-document-test has succeeded Details
rust-build Build rust-build has succeeded Details
rust-test Build rust-test has succeeded Details

This commit is contained in:
Tom Alexander 2023-12-29 10:04:59 -05:00
parent eef3571299
commit eff5cdbf40
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
4 changed files with 5 additions and 0 deletions

View File

@ -9,6 +9,7 @@ use crate::types::AffiliatedKeywordValue;
use crate::types::AffiliatedKeywords;
#[derive(Debug, Serialize)]
#[serde(untagged)]
pub enum AdditionalPropertyValue<'s, 'p> {
SingleString(&'s str),
ListOfStrings(Vec<&'s str>),
@ -21,6 +22,7 @@ pub enum AdditionalPropertyValue<'s, 'p> {
#[derive(Debug, Serialize, Default)]
pub struct AdditionalProperties<'s, 'p> {
#[serde(flatten)]
pub(crate) properties: HashMap<String, AdditionalPropertyValue<'s, 'p>>,
}

View File

@ -18,6 +18,7 @@ use crate::wasm::to_wasm::ToWasmStandardProperties;
#[serde(rename = "org-data")]
pub struct WasmDocument<'s, 'p> {
pub(crate) standard_properties: WasmStandardProperties,
#[serde(flatten)]
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
pub(crate) category: Option<&'p str>,

View File

@ -16,6 +16,7 @@ use crate::wasm::WasmAstNode;
#[serde(rename = "paragraph")]
pub struct WasmParagraph<'s, 'p> {
pub(crate) standard_properties: WasmStandardProperties,
#[serde(flatten)]
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
}

View File

@ -15,6 +15,7 @@ use crate::wasm::to_wasm::ToWasmStandardProperties;
#[serde(rename = "section")]
pub struct WasmSection<'s, 'p> {
pub(crate) standard_properties: WasmStandardProperties,
#[serde(flatten)]
pub(crate) additional_properties: AdditionalProperties<'s, 'p>,
pub(crate) children: Vec<WasmAstNode<'s, 'p>>,
}