Switch everything over to the new to_wasm macro.

This commit is contained in:
Tom Alexander
2023-12-29 15:03:36 -05:00
parent cad2be43bf
commit 579cbb5d11
66 changed files with 1258 additions and 1252 deletions

View File

@@ -1,23 +1,18 @@
use serde::Deserialize;
use serde::Serialize;
use super::ast_node::WasmAstNode;
use super::macros::to_wasm;
use super::standard_properties::WasmStandardProperties;
use super::to_wasm::ToWasm;
use super::AdditionalProperties;
#[cfg(feature = "wasm_test")]
use crate::compare::ElispFact;
use crate::types::Section;
use crate::wasm::to_wasm::ToWasmStandardProperties;
#[derive(Debug, Serialize)]
#[serde(tag = "ast_node")]
#[serde(rename = "section")]
#[derive(Debug, Serialize, Deserialize)]
pub struct WasmSection {
pub(crate) standard_properties: WasmStandardProperties,
#[serde(flatten)]
pub(crate) additional_properties: AdditionalProperties,
pub(crate) children: Vec<WasmAstNode>,
}
to_wasm!(
@@ -25,7 +20,8 @@ to_wasm!(
Section<'s>,
original,
wasm_context,
standard_properties,
{ WasmAstNode::Section(original) },
{ "section".into() },
{
let children = original
.children
@@ -37,23 +33,11 @@ to_wasm!(
})
.collect::<Result<Vec<_>, _>>()?;
Ok(WasmSection {
standard_properties,
additional_properties: AdditionalProperties::default(),
Ok((
children,
})
WasmSection {
additional_properties: AdditionalProperties::default(),
},
))
}
);
impl Into<WasmAstNode> for WasmSection {
fn into(self) -> WasmAstNode {
WasmAstNode::Section(self)
}
}
#[cfg(feature = "wasm_test")]
impl<'s> ElispFact<'s> for WasmSection {
fn get_elisp_name<'b>(&'b self) -> std::borrow::Cow<'s, str> {
"section".into()
}
}