From 1812b1a56ed6f1a4560045458f3c85b99f6642eb Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Wed, 27 Dec 2023 12:04:54 -0500 Subject: [PATCH] Remove phantom data. --- src/wasm/angle_link.rs | 7 ++----- src/wasm/babel_call.rs | 7 ++----- src/wasm/bold.rs | 7 ++----- src/wasm/center_block.rs | 7 ++----- src/wasm/citation.rs | 7 ++----- src/wasm/citation_reference.rs | 7 ++----- src/wasm/clock.rs | 7 ++----- src/wasm/code.rs | 7 ++----- src/wasm/comment.rs | 7 ++----- src/wasm/comment_block.rs | 7 ++----- src/wasm/diary_sexp.rs | 7 ++----- src/wasm/drawer.rs | 7 ++----- src/wasm/dynamic_block.rs | 7 ++----- src/wasm/entity.rs | 7 ++----- src/wasm/example_block.rs | 7 ++----- src/wasm/export_block.rs | 7 ++----- src/wasm/export_snippet.rs | 7 ++----- src/wasm/fixed_width_area.rs | 7 ++----- src/wasm/footnote_definition.rs | 7 ++----- src/wasm/footnote_reference.rs | 7 ++----- src/wasm/headline.rs | 6 +----- src/wasm/horizontal_rule.rs | 7 ++----- src/wasm/inline_babel_call.rs | 7 ++----- src/wasm/inline_source_block.rs | 7 ++----- src/wasm/italic.rs | 7 ++----- src/wasm/keyword.rs | 7 ++----- src/wasm/latex_environment.rs | 7 ++----- src/wasm/latex_fragment.rs | 7 ++----- src/wasm/line_break.rs | 7 ++----- src/wasm/node_property.rs | 7 ++----- src/wasm/org_macro.rs | 7 ++----- src/wasm/paragraph.rs | 7 ++----- src/wasm/plain_link.rs | 7 ++----- src/wasm/plain_list.rs | 7 ++----- src/wasm/plain_list_item.rs | 7 ++----- src/wasm/plain_text.rs | 7 ++----- src/wasm/planning.rs | 7 ++----- src/wasm/property_drawer.rs | 7 ++----- src/wasm/quote_block.rs | 7 ++----- src/wasm/radio_link.rs | 7 ++----- src/wasm/radio_target.rs | 7 ++----- src/wasm/regular_link.rs | 7 ++----- src/wasm/section.rs | 6 +----- src/wasm/special_block.rs | 7 ++----- src/wasm/src_block.rs | 7 ++----- src/wasm/statistics_cookie.rs | 7 ++----- src/wasm/strike_through.rs | 7 ++----- src/wasm/subscript.rs | 7 ++----- src/wasm/superscript.rs | 7 ++----- src/wasm/table.rs | 7 ++----- src/wasm/table_cell.rs | 7 ++----- src/wasm/table_row.rs | 7 ++----- src/wasm/target.rs | 7 ++----- src/wasm/timestamp.rs | 7 ++----- src/wasm/underline.rs | 7 ++----- src/wasm/verbatim.rs | 7 ++----- src/wasm/verse_block.rs | 7 ++----- 57 files changed, 112 insertions(+), 285 deletions(-) diff --git a/src/wasm/angle_link.rs b/src/wasm/angle_link.rs index 7bbf5f0..6dfa2c7 100644 --- a/src/wasm/angle_link.rs +++ b/src/wasm/angle_link.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::AngleLink; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmAngleLink<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmAngleLink { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/babel_call.rs b/src/wasm/babel_call.rs index c3504c0..b1b2b54 100644 --- a/src/wasm/babel_call.rs +++ b/src/wasm/babel_call.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::BabelCall; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmBabelCall<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmBabelCall { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/bold.rs b/src/wasm/bold.rs index 3e40cd9..c306580 100644 --- a/src/wasm/bold.rs +++ b/src/wasm/bold.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Bold; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmBold<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmBold { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/center_block.rs b/src/wasm/center_block.rs index 9f6ad9f..bddcd4e 100644 --- a/src/wasm/center_block.rs +++ b/src/wasm/center_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::CenterBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmCenterBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmCenterBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/citation.rs b/src/wasm/citation.rs index f4370a2..01dac3a 100644 --- a/src/wasm/citation.rs +++ b/src/wasm/citation.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Citation; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmCitation<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmCitation { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/citation_reference.rs b/src/wasm/citation_reference.rs index 39c3bef..c450dcc 100644 --- a/src/wasm/citation_reference.rs +++ b/src/wasm/citation_reference.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::CitationReference; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmCitationReference<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmCitationReference { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/clock.rs b/src/wasm/clock.rs index 3ab6bd5..80d6527 100644 --- a/src/wasm/clock.rs +++ b/src/wasm/clock.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Clock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmClock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmClock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/code.rs b/src/wasm/code.rs index d78bdc5..afdf975 100644 --- a/src/wasm/code.rs +++ b/src/wasm/code.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Code; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmCode<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmCode { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/comment.rs b/src/wasm/comment.rs index f342366..27bc0ef 100644 --- a/src/wasm/comment.rs +++ b/src/wasm/comment.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Comment; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmComment<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmComment { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/comment_block.rs b/src/wasm/comment_block.rs index f4fb78f..575af25 100644 --- a/src/wasm/comment_block.rs +++ b/src/wasm/comment_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::CommentBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmCommentBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmCommentBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/diary_sexp.rs b/src/wasm/diary_sexp.rs index d7203c6..8f53d5f 100644 --- a/src/wasm/diary_sexp.rs +++ b/src/wasm/diary_sexp.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::DiarySexp; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmDiarySexp<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmDiarySexp { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/drawer.rs b/src/wasm/drawer.rs index ef20e0a..29345d6 100644 --- a/src/wasm/drawer.rs +++ b/src/wasm/drawer.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Drawer; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmDrawer<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmDrawer { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/dynamic_block.rs b/src/wasm/dynamic_block.rs index a0cb398..eb2d9f0 100644 --- a/src/wasm/dynamic_block.rs +++ b/src/wasm/dynamic_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::DynamicBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmDynamicBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmDynamicBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/entity.rs b/src/wasm/entity.rs index 21bf966..8f0fa48 100644 --- a/src/wasm/entity.rs +++ b/src/wasm/entity.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Entity; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmEntity<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmEntity { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/example_block.rs b/src/wasm/example_block.rs index fd00c0c..616faa7 100644 --- a/src/wasm/example_block.rs +++ b/src/wasm/example_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::ExampleBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmExampleBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmExampleBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/export_block.rs b/src/wasm/export_block.rs index 191c06e..cb6fda7 100644 --- a/src/wasm/export_block.rs +++ b/src/wasm/export_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::ExportBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmExportBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmExportBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/export_snippet.rs b/src/wasm/export_snippet.rs index c40d3d4..0198ae0 100644 --- a/src/wasm/export_snippet.rs +++ b/src/wasm/export_snippet.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::ExportSnippet; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmExportSnippet<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmExportSnippet { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/fixed_width_area.rs b/src/wasm/fixed_width_area.rs index 5e89642..b746f8d 100644 --- a/src/wasm/fixed_width_area.rs +++ b/src/wasm/fixed_width_area.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::FixedWidthArea; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmFixedWidthArea<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmFixedWidthArea { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/footnote_definition.rs b/src/wasm/footnote_definition.rs index ba3862f..a8bd9c7 100644 --- a/src/wasm/footnote_definition.rs +++ b/src/wasm/footnote_definition.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::FootnoteDefinition; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmFootnoteDefinition<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmFootnoteDefinition { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/footnote_reference.rs b/src/wasm/footnote_reference.rs index ce34078..8ae0381 100644 --- a/src/wasm/footnote_reference.rs +++ b/src/wasm/footnote_reference.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::FootnoteReference; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmFootnoteReference<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmFootnoteReference { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/headline.rs b/src/wasm/headline.rs index df10dd9..dbaab62 100644 --- a/src/wasm/headline.rs +++ b/src/wasm/headline.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::ast_node::WasmAstNode; @@ -14,8 +12,7 @@ use crate::wasm::to_wasm::ToWasmStandardProperties; #[serde(rename = "headline")] pub(crate) struct WasmHeadline<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -28,7 +25,6 @@ to_wasm!( Ok(WasmHeadline { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/horizontal_rule.rs b/src/wasm/horizontal_rule.rs index 9647f24..bb2b0d8 100644 --- a/src/wasm/horizontal_rule.rs +++ b/src/wasm/horizontal_rule.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::HorizontalRule; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmHorizontalRule<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmHorizontalRule { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/inline_babel_call.rs b/src/wasm/inline_babel_call.rs index 2968fdc..84f75a6 100644 --- a/src/wasm/inline_babel_call.rs +++ b/src/wasm/inline_babel_call.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::InlineBabelCall; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmInlineBabelCall<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmInlineBabelCall { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/inline_source_block.rs b/src/wasm/inline_source_block.rs index 2f711b9..49f2594 100644 --- a/src/wasm/inline_source_block.rs +++ b/src/wasm/inline_source_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::InlineSourceBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmInlineSourceBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmInlineSourceBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/italic.rs b/src/wasm/italic.rs index 5c524a4..40fd465 100644 --- a/src/wasm/italic.rs +++ b/src/wasm/italic.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Italic; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmItalic<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmItalic { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/keyword.rs b/src/wasm/keyword.rs index abdf431..7b9003e 100644 --- a/src/wasm/keyword.rs +++ b/src/wasm/keyword.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Keyword; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmKeyword<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmKeyword { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/latex_environment.rs b/src/wasm/latex_environment.rs index 6035759..7a65390 100644 --- a/src/wasm/latex_environment.rs +++ b/src/wasm/latex_environment.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::LatexEnvironment; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmLatexEnvironment<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmLatexEnvironment { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/latex_fragment.rs b/src/wasm/latex_fragment.rs index 344932f..98416fa 100644 --- a/src/wasm/latex_fragment.rs +++ b/src/wasm/latex_fragment.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::LatexFragment; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmLatexFragment<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmLatexFragment { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/line_break.rs b/src/wasm/line_break.rs index 89ca544..949770d 100644 --- a/src/wasm/line_break.rs +++ b/src/wasm/line_break.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::LineBreak; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmLineBreak<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmLineBreak { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/node_property.rs b/src/wasm/node_property.rs index c1d6c28..9b06b93 100644 --- a/src/wasm/node_property.rs +++ b/src/wasm/node_property.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::NodeProperty; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmNodeProperty<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmNodeProperty { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/org_macro.rs b/src/wasm/org_macro.rs index 83c40de..7bdff9f 100644 --- a/src/wasm/org_macro.rs +++ b/src/wasm/org_macro.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::OrgMacro; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmOrgMacro<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmOrgMacro { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/paragraph.rs b/src/wasm/paragraph.rs index 523e857..96610c7 100644 --- a/src/wasm/paragraph.rs +++ b/src/wasm/paragraph.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Paragraph; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmParagraph<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmParagraph { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/plain_link.rs b/src/wasm/plain_link.rs index 1c867dc..93359dd 100644 --- a/src/wasm/plain_link.rs +++ b/src/wasm/plain_link.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::PlainLink; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmPlainLink<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmPlainLink { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/plain_list.rs b/src/wasm/plain_list.rs index 0e5d628..48ec401 100644 --- a/src/wasm/plain_list.rs +++ b/src/wasm/plain_list.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::PlainList; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmPlainList<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmPlainList { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/plain_list_item.rs b/src/wasm/plain_list_item.rs index 7872d19..6c9b8cc 100644 --- a/src/wasm/plain_list_item.rs +++ b/src/wasm/plain_list_item.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::PlainListItem; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmPlainListItem<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmPlainListItem { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/plain_text.rs b/src/wasm/plain_text.rs index f7bdd1a..c715a1e 100644 --- a/src/wasm/plain_text.rs +++ b/src/wasm/plain_text.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::PlainText; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmPlainText<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmPlainText { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/planning.rs b/src/wasm/planning.rs index b2cf630..73eb862 100644 --- a/src/wasm/planning.rs +++ b/src/wasm/planning.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Planning; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmPlanning<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmPlanning { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/property_drawer.rs b/src/wasm/property_drawer.rs index 5318017..0a84aa3 100644 --- a/src/wasm/property_drawer.rs +++ b/src/wasm/property_drawer.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::PropertyDrawer; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmPropertyDrawer<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmPropertyDrawer { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/quote_block.rs b/src/wasm/quote_block.rs index 9fccc0c..82b7e72 100644 --- a/src/wasm/quote_block.rs +++ b/src/wasm/quote_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::QuoteBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmQuoteBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmQuoteBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/radio_link.rs b/src/wasm/radio_link.rs index 235aa53..8335ef5 100644 --- a/src/wasm/radio_link.rs +++ b/src/wasm/radio_link.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::RadioLink; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmRadioLink<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmRadioLink { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/radio_target.rs b/src/wasm/radio_target.rs index 62e5227..32dbe42 100644 --- a/src/wasm/radio_target.rs +++ b/src/wasm/radio_target.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::RadioTarget; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmRadioTarget<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmRadioTarget { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/regular_link.rs b/src/wasm/regular_link.rs index 8311b7b..b26043a 100644 --- a/src/wasm/regular_link.rs +++ b/src/wasm/regular_link.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::RegularLink; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmRegularLink<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmRegularLink { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/section.rs b/src/wasm/section.rs index 55f3812..c9739e5 100644 --- a/src/wasm/section.rs +++ b/src/wasm/section.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::ast_node::WasmAstNode; @@ -14,8 +12,7 @@ use crate::wasm::to_wasm::ToWasmStandardProperties; #[serde(rename = "section")] pub(crate) struct WasmSection<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -28,7 +25,6 @@ to_wasm!( Ok(WasmSection { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/special_block.rs b/src/wasm/special_block.rs index 288f89b..9b5346a 100644 --- a/src/wasm/special_block.rs +++ b/src/wasm/special_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::SpecialBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmSpecialBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmSpecialBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/src_block.rs b/src/wasm/src_block.rs index d2a3065..237a363 100644 --- a/src/wasm/src_block.rs +++ b/src/wasm/src_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::SrcBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmSrcBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmSrcBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/statistics_cookie.rs b/src/wasm/statistics_cookie.rs index 5dc698d..339663a 100644 --- a/src/wasm/statistics_cookie.rs +++ b/src/wasm/statistics_cookie.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::StatisticsCookie; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmStatisticsCookie<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmStatisticsCookie { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/strike_through.rs b/src/wasm/strike_through.rs index 272b4dd..efcf63f 100644 --- a/src/wasm/strike_through.rs +++ b/src/wasm/strike_through.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::StrikeThrough; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmStrikeThrough<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmStrikeThrough { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/subscript.rs b/src/wasm/subscript.rs index 507a152..80b6e05 100644 --- a/src/wasm/subscript.rs +++ b/src/wasm/subscript.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Subscript; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmSubscript<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmSubscript { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/superscript.rs b/src/wasm/superscript.rs index f67c085..a3f6899 100644 --- a/src/wasm/superscript.rs +++ b/src/wasm/superscript.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Superscript; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmSuperscript<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmSuperscript { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/table.rs b/src/wasm/table.rs index e7d8a00..3a6ef16 100644 --- a/src/wasm/table.rs +++ b/src/wasm/table.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Table; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmTable<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmTable { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/table_cell.rs b/src/wasm/table_cell.rs index 35aad9c..f775109 100644 --- a/src/wasm/table_cell.rs +++ b/src/wasm/table_cell.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::TableCell; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmTableCell<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmTableCell { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/table_row.rs b/src/wasm/table_row.rs index 9bd7271..99bf523 100644 --- a/src/wasm/table_row.rs +++ b/src/wasm/table_row.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::TableRow; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmTableRow<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmTableRow { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/target.rs b/src/wasm/target.rs index e5604b7..3472a8b 100644 --- a/src/wasm/target.rs +++ b/src/wasm/target.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Target; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmTarget<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmTarget { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/timestamp.rs b/src/wasm/timestamp.rs index 84e1587..f8e1182 100644 --- a/src/wasm/timestamp.rs +++ b/src/wasm/timestamp.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Timestamp; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmTimestamp<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmTimestamp { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/underline.rs b/src/wasm/underline.rs index 4725aa2..ec94c13 100644 --- a/src/wasm/underline.rs +++ b/src/wasm/underline.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Underline; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmUnderline<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmUnderline { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/verbatim.rs b/src/wasm/verbatim.rs index 56e2edd..adb3bef 100644 --- a/src/wasm/verbatim.rs +++ b/src/wasm/verbatim.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::Verbatim; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmVerbatim<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmVerbatim { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } ); diff --git a/src/wasm/verse_block.rs b/src/wasm/verse_block.rs index 68e5b92..8731bf6 100644 --- a/src/wasm/verse_block.rs +++ b/src/wasm/verse_block.rs @@ -1,5 +1,3 @@ -use std::marker::PhantomData; - use serde::Serialize; use super::macros::to_wasm; @@ -7,14 +5,14 @@ use super::standard_properties::WasmStandardProperties; use super::to_wasm::ToWasm; use crate::types::VerseBlock; use crate::wasm::to_wasm::ToWasmStandardProperties; +use crate::wasm::WasmAstNode; #[derive(Debug, Serialize)] #[serde(tag = "ast_node")] #[serde(rename = "org-data")] pub(crate) struct WasmVerseBlock<'s, 'p> { standard_properties: WasmStandardProperties, - children: Vec<()>, - phantom: PhantomData<&'s ()>, + children: Vec>, } to_wasm!( @@ -27,7 +25,6 @@ to_wasm!( Ok(WasmVerseBlock { standard_properties, children: Vec::new(), - phantom: PhantomData, }) } );