Cleanup

- renamed module
- fixed warnings in different feature configurations

Author: FedorSmirnov89

crates/cli/Cargo.toml

@@ -14,12 +14,7 @@ categories.workspace = true
 exclude.workspace = true
 
 [dependencies]
-wasmi = { workspace = true, default-features = false, features = [
-    "wat",
-    "serialization",
-    "deserialization",
-    "parser",
-] }
+wasmi = { workspace = true, features = ["wat"] }
 wasmi_wasi = { workspace = true }
 anyhow = "1"
 clap = { version = "4", features = ["derive"] }

crates/cli/src/args.rs

@@ -8,23 +8,7 @@ use std::{
 };
 use wasmi_wasi::{ambient_authority, Dir, TcpListener, WasiCtx, WasiCtxBuilder};
 
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None, trailing_var_arg = true)]
-pub enum Cli {
-    Args(Args),
-    Serialize(SerializeArgs),
-}
-
-#[derive(Parser, Debug)]
-pub struct SerializeArgs {
-    /// The file containing the WebAssembly module to serialize.
-    #[clap(value_name = "MODULE", value_hint = clap::ValueHint::FilePath)]
-    pub module: PathBuf,
-    /// The output file for the serialized module (or '-' for stdout).
-    #[clap(long, value_name = "OUTPUT", value_hint = clap::ValueHint::FilePath)]
-    pub output: Option<PathBuf>,
-}
-
+/// A CLI flag value key-value argument.
 #[derive(Debug, Clone)]
 struct KeyValue {
     key: String,

crates/cli/src/main.rs

@@ -1,7 +1,6 @@
 use crate::{
-    args::{Args, Cli},
+    args::Args,
     display::{DisplayExportedFuncs, DisplayFuncType, DisplaySequence, DisplayValue},
-    serialize::serialize,
 };
 use anyhow::{anyhow, bail, Error, Result};
 use clap::Parser;
@@ -12,22 +11,13 @@ use wasmi::{Func, FuncType, Val};
 mod args;
 mod context;
 mod display;
-mod serialize;
 mod utils;
 
 #[cfg(test)]
 mod tests;
 
 fn main() -> Result<()> {
-    let cli = Cli::parse();
-
-    match cli {
-        Cli::Args(args) => run(args),
-        Cli::Serialize(args) => serialize(args),
-    }
-}
-
-fn run(args: Args) -> Result<()> {
+    let args = Args::parse();
     let wasm_file = args.wasm_file();
     let wasi_ctx = args.wasi_context()?;
     let mut ctx = Context::new(wasm_file, wasi_ctx, args.fuel(), args.compilation_mode())?;

crates/cli/src/serialize.rs

@@ -303,7 +303,7 @@ fn size_of() {
     assert_eq!(::core::mem::align_of::<Instruction>(), 4);
 }
 
-#[cfg(all(test, any(feature = "serialization", feature = "deserialization")))]
+#[cfg(all(test, feature = "serialization", feature = "deserialization"))]
 mod serde_tests {
     use super::*;
 

crates/ir/src/enum.rs

@@ -425,6 +425,7 @@ impl Engine {
     }
 
     /// Returns all Wasmi IR instructions for the given EngineFunc.
+    #[cfg(feature = "serialization")]
     pub(crate) fn get_instructions(
         &self,
         func: crate::engine::EngineFunc,
@@ -436,6 +437,7 @@ impl Engine {
     }
 
     /// Returns a reference to the compiled function data for the given EngineFunc.
+    #[cfg(feature = "serialization")]
     pub(crate) fn get_compiled_func(
         &self,
         func: crate::engine::EngineFunc,

crates/wasmi/src/engine/mod.rs

@@ -91,7 +91,8 @@ mod foreach_tuple;
 #[cfg(all(test, feature = "parser"))]
 pub mod tests;
 
-pub mod serialization;
+#[cfg(any(feature = "serialization", feature = "deserialization"))]
+pub mod preparsed;
 
 pub(crate) mod engine;
 mod error;

crates/wasmi/src/lib.rs

@@ -378,6 +378,7 @@ impl ModuleHeaderBuilder {
 
 impl ModuleBuilder {
     /// Sets the data segments for the module, replacing any previously set segments.
+    #[cfg(feature = "deserialization")]
     pub fn set_data_segments(&mut self, data_segments: super::data::DataSegments) {
         self.data_segments = super::data::DataSegmentsBuilder::from_data_segments(data_segments);
     }

crates/wasmi/src/module/builder.rs

@@ -63,6 +63,7 @@ impl AsRef<[u8]> for PassiveDataSegmentBytes {
     }
 }
 
+#[cfg(feature = "deserialization")]
 impl PassiveDataSegmentBytes {
     pub(crate) fn from_vec(vec: Vec<u8>) -> Self {
         Self {

crates/wasmi/src/module/data.rs

@@ -496,19 +496,16 @@ impl Module {
         self.inner.custom_sections.iter()
     }
 
-    /// Returns the start function index if present, as a u32.
-    pub(crate) fn start_func_index(&self) -> Option<u32> {
-        self.module_header().start.map(export::FuncIdx::into_u32)
-    }
-
     /// Returns an iterator over all data segments as InitDataSegment, including their bytes.
+    #[cfg(feature = "serialization")]
     pub(crate) fn all_init_data_segments(
         &self,
     ) -> impl Iterator<Item = crate::module::InitDataSegment<'_>> {
         self.inner.data_segments.into_iter()
     }
 
     /// Returns an iterator over all element segments.
+    #[cfg(feature = "serialization")]
     pub(crate) fn element_segments(&self) -> impl Iterator<Item = &ElementSegment> {
         self.module_header().element_segments.iter()
     }