chore: cleanup tests / devdeps, fix doom example

Signed-off-by: Henry <mail@henrygressmann.de>

Author: explodingcamera

Cargo.lock

@@ -24,7 +24,7 @@ tinywasm = { path = "crates/tinywasm", version = "0.11.0-pre.0", default-feature
 tinywasm-parser = { path = "crates/parser", version = "0.11.0-pre.0", default-features = false }
 tinywasm-types = { path = "crates/types", version = "0.11.0-pre.0", default-features = false }
 
-eyre = "0.6"
+anyhow = "1.0"
 log = "0.4"
 owo-colors = { version = "4.3" }
 pretty_env_logger = "0.5"
@@ -44,10 +44,32 @@ criterion = { version = "0.8", default-features = false, features = [
 name = "wasm-rust"
 test = false
 
+[[bench]]
+harness = false
+name = "argon2id"
+
+[[bench]]
+harness = false
+name = "fibonacci"
+
+[[bench]]
+harness = false
+name = "tinywasm"
+
+[[bench]]
+harness = false
+name = "tinywasm_modes"
+
+[[bench]]
+harness = false
+name = "memory_backends"
+
 [dev-dependencies]
-eyre.workspace = true
+anyhow.workspace = true
+criterion.workspace = true
 pretty_env_logger.workspace = true
 tinywasm = { path = "crates/tinywasm" }
+tinywasm-parser.workspace = true
 wat.workspace = true
 
 [profile.bench]

Cargo.toml

@@ -1,9 +1,8 @@
 use criterion::{Criterion, criterion_group, criterion_main};
-use eyre::Result;
-use tinywasm::{ModuleInstance, Store, types};
+use tinywasm::{ModuleInstance, Result, Store, types};
 use types::Module;
 
-const WASM: &[u8] = include_bytes!("../../../examples/rust/out/argon2id.wasm");
+const WASM: &[u8] = include_bytes!("../examples/rust/out/argon2id.wasm");
 
 fn argon2id_parse() -> Result<Module> {
     let parser = tinywasm_parser::Parser::default();

crates/tinywasm/benches/argon2id.rs benches/argon2id.rscrates/tinywasm/benches/argon2id.rs renamed to benches/argon2id.rs

@@ -1,9 +1,8 @@
 use criterion::{Criterion, criterion_group, criterion_main};
-use eyre::Result;
-use tinywasm::{ModuleInstance, Store, types};
+use tinywasm::{ModuleInstance, Result, Store, types};
 use types::Module;
 
-const WASM: &[u8] = include_bytes!("../../../examples/rust/out/fibonacci.wasm");
+const WASM: &[u8] = include_bytes!("../examples/rust/out/fibonacci.wasm");
 
 fn fibonacci_parse() -> Result<Module> {
     let parser = tinywasm_parser::Parser::default();

crates/tinywasm/benches/fibonacci.rs benches/fibonacci.rscrates/tinywasm/benches/fibonacci.rs renamed to benches/fibonacci.rs

@@ -1,10 +1,9 @@
 use criterion::{Criterion, criterion_group, criterion_main};
-use eyre::Result;
 use tinywasm::engine::Config;
-use tinywasm::{Engine, FuncContext, HostFunction, Imports, ModuleInstance, Store, types};
+use tinywasm::{Engine, FuncContext, HostFunction, Imports, ModuleInstance, Result, Store, types};
 use types::Module;
 
-const WASM: &[u8] = include_bytes!("../../../examples/rust/out/tinywasm.wasm");
+const WASM: &[u8] = include_bytes!("../examples/rust/out/tinywasm.wasm");
 
 fn tinywasm_parse() -> Result<Module> {
     let parser = tinywasm_parser::Parser::default();

…ates/tinywasm/benches/memory_backends.rs benches/memory_backends.rscrates/tinywasm/benches/memory_backends.rs renamed to benches/memory_backends.rs crates/tinywasm/benches/memory_backends.rs renamed to benches/memory_backends.rs

@@ -1,10 +1,11 @@
 use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
-use eyre::Result;
 use tinywasm::engine::{Config, FuelPolicy};
 use tinywasm::types::Module;
-use tinywasm::{Engine, ExecProgress, FuncContext, FunctionTyped, HostFunction, Imports, ModuleInstance, Store};
+use tinywasm::{
+    Engine, ExecProgress, FuncContext, FunctionTyped, HostFunction, Imports, ModuleInstance, Result, Store,
+};
 
-const WASM: &[u8] = include_bytes!("../../../examples/rust/out/tinywasm.wasm");
+const WASM: &[u8] = include_bytes!("../examples/rust/out/tinywasm.wasm");
 const FUEL_PER_ROUND: u32 = 512;
 const TIME_BUDGET_PER_ROUND: core::time::Duration = core::time::Duration::from_micros(50);
 const BENCH_MEASUREMENT_TIME: core::time::Duration = core::time::Duration::from_secs(10);

crates/tinywasm/benches/tinywasm.rs benches/tinywasm.rscrates/tinywasm/benches/tinywasm.rs renamed to benches/tinywasm.rs

@@ -23,12 +23,14 @@ path = "src/bin.rs"
 
 [dependencies]
 anstream = { version = "1.0" }
+anyhow.workspace = true
 clap = { version = "4.6", features = ["derive"] }
 clap_complete = "4.6"
-eyre.workspace = true
 log.workspace = true
 owo-colors = { workspace = true }
 pretty_env_logger.workspace = true
+serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
 tinywasm = { workspace = true, features = [
   "archive",
   "canonicalize-nans",
@@ -39,6 +41,7 @@ tinywasm = { workspace = true, features = [
   "std",
   "validate",
 ] }
+wasm-testsuite = { workspace = true, optional = true }
 wast = { workspace = true, optional = true }
 wat = { workspace = true, optional = true }
 
@@ -49,5 +52,6 @@ tempfile = "3.27"
 
 [features]
 default = ["wast", "wat"]
+tests = ["dep:serde", "dep:serde_json", "dep:wasm-testsuite", "wast"]
 wast = ["dep:wast"]
 wat = ["dep:wat"]

crates/tinywasm/benches/tinywasm_modes.rs benches/tinywasm_modes.rscrates/tinywasm/benches/tinywasm_modes.rs renamed to benches/tinywasm_modes.rs

@@ -1,5 +1,5 @@
+use anyhow::Result;
 use clap::Parser;
-use eyre::Result;
 use tinywasm_cli::{Cli, run_cli};
 
 fn main() -> Result<()> {

crates/cli/Cargo.toml

@@ -1,4 +1,4 @@
-use eyre::Result;
+use anyhow::Result;
 
 use crate::cli::CompileArgs;
 use crate::load::{default_twasm_output_path, load_compilable_module, write_output_bytes};