f

Author: axic

chisel/src/driver.rs

@@ -17,7 +17,7 @@ use libchisel::{
     checkfloat::CheckFloat, checkstartfunc::CheckStartFunc, deployer::Deployer,
     dropsection::DropSection, remapimports::RemapImports, remapstart::RemapStart, repack::Repack,
     snip::Snip, trimexports::TrimExports, trimstartfunc::TrimStartFunc,
-    verifyexports::VerifyExports, verifyimports::VerifyImports, Module, ModulePreset,
+    verifyexports::VerifyExports, verifyimports::VerifyImports, WasmModule, ModulePreset,
     ModuleTranslator, ModuleValidator,
 };
 
@@ -144,7 +144,7 @@ impl ChiselDriver {
             };
 
             // Deserialize the Wasm binary and parse its names section.
-            let mut wasm = match Module::from_bytes(wasm_raw) {
+            let mut wasm = match WasmModule::from_bytes(wasm_raw) {
                 Ok(wasm) => {
                     chisel_debug!(1, "Successfully deserialized Wasm module");
                     // TODO: Make this error recoverable
@@ -199,7 +199,7 @@ impl ChiselDriver {
         &mut self,
         name: String,
         module: ModuleConfig,
-        wasm: &mut Module,
+        wasm: &mut WasmModule,
     ) -> Result<ModuleResult, DriverError> {
         let result = match name.as_str() {
             "checkfloat" => {

chisel/src/result.rs

@@ -17,7 +17,7 @@ use ansi_term::Colour::{Green, Red, Yellow};
 
 #[cfg(feature = "wabt")]
 use libchisel::wabt;
-use libchisel::{Module, ModuleError};
+use libchisel::{WasmModule, ModuleError};
 
 #[derive(Clone)]
 /// Main result structure returned by ChiselDriver, containing a manifest of modules executed and
@@ -30,7 +30,7 @@ pub struct RulesetResult {
     ruleset_name: String,
     results: Vec<ModuleResult>,
     output_path: PathBuf,
-    output_module: Option<Module>,
+    output_module: Option<WasmModule>,
 }
 
 #[derive(Clone)]
@@ -78,7 +78,7 @@ impl RulesetResult {
         self.output_path = path;
     }
 
-    pub fn set_output_module(&mut self, module: Module) {
+    pub fn set_output_module(&mut self, module: WasmModule) {
         self.output_module = Some(module);
     }
 
@@ -207,7 +207,7 @@ mod tests {
     fn writer_success_to_stdout() {
         let mut ruleset_result = {
             let mut result = RulesetResult::new("Test".to_string());
-            let module = Module::default();
+            let module = WasmModule::default();
             result.set_output_module(module);
             result.set_output_path(PathBuf::from("/dev/stdout"));
             result
@@ -228,7 +228,7 @@ mod tests {
     fn writer_deny_raw_binary_to_stdout() {
         let mut ruleset_result = {
             let mut result = RulesetResult::new("Test".to_string());
-            let module = Module::default();
+            let module = WasmModule::default();
             result.set_output_module(module);
             result.set_output_path(PathBuf::from("/dev/stdout"));
             result
@@ -242,7 +242,7 @@ mod tests {
     fn writer_invalid_mode() {
         let mut ruleset_result = {
             let mut result = RulesetResult::new("Test".to_string());
-            let module = Module::default();
+            let module = WasmModule::default();
             result.set_output_module(module);
             result.set_output_path(PathBuf::from("/dev/stdout"));
             result