From b9b517375c1f8c50c0096ef61d2395decf071914 Mon Sep 17 00:00:00 2001
From: Henry Gressmann <mail@henrygressmann.de>
Date: Fri, 1 Dec 2023 14:06:05 +0100
Subject: chore: move TinyWasmModule to types

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>
---
 crates/parser/src/lib.rs | 18 +-----------------
 crates/types/Cargo.toml  |  2 ++
 crates/types/src/lib.rs  | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'crates')

diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs
index 39bb1c6..d2b6d9c 100644
--- a/crates/parser/src/lib.rs
+++ b/crates/parser/src/lib.rs
@@ -9,10 +9,9 @@ extern crate std;
 mod conversion;
 mod error;
 mod module;
-use alloc::boxed::Box;
 pub use error::*;
 use module::ModuleReader;
-use tinywasm_types::{Export, FuncType, Function};
+use tinywasm_types::TinyWasmModule;
 
 pub struct Parser {}
 
@@ -45,21 +44,6 @@ impl Parser {
     }
 }
 
-pub struct TinyWasmModule {
-    pub version: Option<u16>,
-    pub start_func: Option<u32>,
-
-    pub types: Option<Box<[FuncType]>>,
-    pub funcs: Option<Box<[Function]>>,
-    pub exports: Option<Box<[Export]>>,
-    // pub tables: Option<TableType>,
-    // pub memories: Option<MemoryType>,
-    // pub globals: Option<GlobalType>,
-    // pub elements: Option<ElementSectionReader<'a>>,
-    // pub imports: Option<ImportSectionReader<'a>>,
-    // pub data_segments: Option<DataSectionReader<'a>>,
-}
-
 impl TryFrom<ModuleReader<'_>> for TinyWasmModule {
     type Error = ParseError;
 
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 83263a6..fa2fc6e 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -5,7 +5,9 @@ edition="2021"
 
 [dependencies]
 tracing={version="0.1.38", default-features=false} # logging
+rkyv={version="0.7", optional=true, default-features=false}
 
 [features]
 default=["std"]
 std=[]
+serialize=["dep:rkyv"]
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index e68efe7..e793b26 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -3,6 +3,21 @@ extern crate alloc;
 mod instructions;
 pub use instructions::*;
 
+pub struct TinyWasmModule {
+    pub version: Option<u16>,
+    pub start_func: Option<u32>,
+
+    pub types: Option<Box<[FuncType]>>,
+    pub funcs: Option<Box<[Function]>>,
+    pub exports: Option<Box<[Export]>>,
+    // pub tables: Option<TableType>,
+    // pub memories: Option<MemoryType>,
+    // pub globals: Option<GlobalType>,
+    // pub elements: Option<ElementSectionReader<'a>>,
+    // pub imports: Option<ImportSectionReader<'a>>,
+    // pub data_segments: Option<DataSectionReader<'a>>,
+}
+
 /// A WebAssembly value.
 /// See https://webassembly.github.io/spec/core/syntax/types.html#value-types
 #[derive(Debug, Clone, PartialEq)]
-- 
cgit v1.3.1