From 64ed1bf86950c52e3400c0a536e223a53f48a4b7 Mon Sep 17 00:00:00 2001
From: Henry Gressmann <mail@henrygressmann.de>
Date: Thu, 25 Jan 2024 01:01:25 +0100
Subject: feat: pass full wasm 1.0 testsuite

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>
---
 crates/cli/src/args.rs | 27 ++++++---------------------
 crates/cli/src/bin.rs  |  7 +------
 2 files changed, 7 insertions(+), 27 deletions(-)

(limited to 'crates/cli/src')

diff --git a/crates/cli/src/args.rs b/crates/cli/src/args.rs
index 379ecf8..3959572 100644
--- a/crates/cli/src/args.rs
+++ b/crates/cli/src/args.rs
@@ -17,29 +17,14 @@ impl From<WasmArg> for WasmValue {
 impl FromStr for WasmArg {
     type Err = String;
     fn from_str(s: &str) -> std::prelude::v1::Result<Self, Self::Err> {
-        let [ty, val]: [&str; 2] = s
-            .split(':')
-            .collect::<Vec<_>>()
-            .try_into()
-            .map_err(|e| format!("invalid arguments: {:?}", e))?;
+        let [ty, val]: [&str; 2] =
+            s.split(':').collect::<Vec<_>>().try_into().map_err(|e| format!("invalid arguments: {:?}", e))?;
 
         let arg: WasmValue = match ty {
-            "i32" => val
-                .parse::<i32>()
-                .map_err(|e| format!("invalid argument value for i32: {e:?}"))?
-                .into(),
-            "i64" => val
-                .parse::<i64>()
-                .map_err(|e| format!("invalid argument value for i64: {e:?}"))?
-                .into(),
-            "f32" => val
-                .parse::<f32>()
-                .map_err(|e| format!("invalid argument value for f32: {e:?}"))?
-                .into(),
-            "f64" => val
-                .parse::<f64>()
-                .map_err(|e| format!("invalid argument value for f64: {e:?}"))?
-                .into(),
+            "i32" => val.parse::<i32>().map_err(|e| format!("invalid argument value for i32: {e:?}"))?.into(),
+            "i64" => val.parse::<i64>().map_err(|e| format!("invalid argument value for i64: {e:?}"))?.into(),
+            "f32" => val.parse::<f32>().map_err(|e| format!("invalid argument value for f32: {e:?}"))?.into(),
+            "f64" => val.parse::<f64>().map_err(|e| format!("invalid argument value for f64: {e:?}"))?.into(),
             t => return Err(format!("Invalid arg type: {}", t)),
         };
 
diff --git a/crates/cli/src/bin.rs b/crates/cli/src/bin.rs
index c8ab379..1c166cf 100644
--- a/crates/cli/src/bin.rs
+++ b/crates/cli/src/bin.rs
@@ -84,12 +84,7 @@ fn main() -> Result<()> {
     let cwd = std::env::current_dir()?;
 
     match args.nested {
-        TinyWasmSubcommand::Run(Run {
-            wasm_file,
-            engine,
-            args,
-            func,
-        }) => {
+        TinyWasmSubcommand::Run(Run { wasm_file, engine, args, func }) => {
             debug!("args: {:?}", args);
 
             let path = cwd.join(wasm_file.clone());
-- 
cgit v1.3.1