Remove wat-fmt from workspace and update dependencies in Cargo.toml; clean up wat_emitter.rs

Author: 0xGeorgii

.vscode/settings.json

@@ -7,7 +7,6 @@
         "./wat-codegen/Cargo.toml",
         "./tests/Cargo.toml",
         "./playground-server/Cargo.toml",
-        "./wat-fmt/Cargo.toml",
         "./wasm-fmt/Cargo.toml"
     ]
 }

Cargo.toml

@@ -10,8 +10,7 @@ members = [
     "inference",
     "tests",
     "playground-server",
-    "wat-fmt",
-    "wasm-fmt",
+    "wasm-fmt"
 ]
 
 [workspace.package]
@@ -29,10 +28,10 @@ inference-wasm-v-translator = { path = "./wasm-v-translator", version = "0.0.1"
 inference-wat-codegen = { path = "./wat-codegen", version = "0.0.1" }
 inference-tests = { path = "./tests", version = "0.0.1" }
 inference-playground-server = { path = "./playground-server", version = "0.0.1" }
-inf-wast = "0.0.6"
-inf-wasmparser = "0.0.6"
-wat-fmt = { path = "./wat-fmt", version = "0.0.1" }
+inf-wast = "0.0.8"
+inf-wasmparser = "0.0.8"
+wat-fmt = "0.0.8"
 wasm-fmt = { path = "./wasm-fmt", version = "0.0.1" }
 tree-sitter = "0.25.3"
 tree-sitter-inference = "0.0.29"
-anyhow = "1.0.97"
+anyhow = "1.0.98"

ast/src/builder.rs

@@ -47,7 +47,7 @@ pub fn build_ast(root: Node, code: &[u8]) -> anyhow::Result<SourceFile> {
                         return Err(anyhow::anyhow!("Unexpected child of type {child_kind}"));
                     }
                 }
-            };
+            }
         }
     }
     Ok(ast)

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2024-12-17"
+channel = "nightly"

wat-codegen/src/wat_emitter.rs

@@ -1,7 +1,5 @@
 #![warn(clippy::pedantic)]
 
-use std::collections::HashMap;
-
 use inference_ast::types::{
     AssertStatement, BinaryExpression, BlockType, Definition, Expression, FunctionCallExpression,
     FunctionDefinition, Literal, MemberAccessExpression, OperatorKind, SourceFile, SpecDefinition,
@@ -39,7 +37,7 @@ fn s_assume() -> String {
 #[derive(Debug, Clone, Default)]
 pub struct WatEmitter {
     source_files: Vec<SourceFile>,
-    functions_to_emit: HashMap<u32, Vec<String>>,
+    // functions_to_emit: HashMap<u32, Vec<String>>,
 }
 
 impl WatEmitter {