diff --git a/lib/emscripten/src/env.rs b/lib/emscripten/src/env.rs index ac03c420b..99c87a2b0 100644 --- a/lib/emscripten/src/env.rs +++ b/lib/emscripten/src/env.rs @@ -198,12 +198,12 @@ pub extern "C" fn ___build_environment(environ: c_int, instance: &mut Instance) const TOTAL_ENV_SIZE: u32 = 1024; let mut environment = instance.memory_offset_addr(0, environ as _) as *mut c_int; unsafe { - let (pool_offset, pool_slice): (u32, &mut [u8]) = + let (pool_offset, _pool_slice): (u32, &mut [u8]) = allocate_on_stack(TOTAL_ENV_SIZE as u32, instance); - let (env_offset, env_slice): (u32, &mut [u8]) = + let (env_offset, _env_slice): (u32, &mut [u8]) = allocate_on_stack((MAX_ENV_VALUES * 4) as u32, instance); let mut env_ptr = instance.memory_offset_addr(0, env_offset as _) as *mut c_int; - let mut pool_ptr = instance.memory_offset_addr(0, pool_offset as _) as *mut c_int; + let mut _pool_ptr = instance.memory_offset_addr(0, pool_offset as _) as *mut c_int; *env_ptr = pool_offset as i32; *environment = env_offset as i32; diff --git a/lib/emscripten/src/exception.rs b/lib/emscripten/src/exception.rs index a7b0e9e63..2ad682256 100644 --- a/lib/emscripten/src/exception.rs +++ b/lib/emscripten/src/exception.rs @@ -10,7 +10,7 @@ pub extern "C" fn ___cxa_allocate_exception(size: u32, instance: &mut Instance) /// emscripten: ___cxa_throw /// TODO: We don't have support for exceptions yet -pub extern "C" fn ___cxa_throw(ptr: u32, ty: u32, destructor: u32, instance: &mut Instance) { +pub extern "C" fn ___cxa_throw(_ptr: u32, ty: u32, destructor: u32, instance: &mut Instance) { debug!("emscripten::___cxa_throw"); _abort(); } diff --git a/lib/emscripten/src/jmp.rs b/lib/emscripten/src/jmp.rs index d32e6ce74..836359a08 100644 --- a/lib/emscripten/src/jmp.rs +++ b/lib/emscripten/src/jmp.rs @@ -1,5 +1,4 @@ use libc::{c_int, c_void}; -use std::cell::UnsafeCell; use wasmer_runtime::Instance; /// setjmp diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs index c94425af5..5db97d920 100644 --- a/lib/emscripten/src/lib.rs +++ b/lib/emscripten/src/lib.rs @@ -1,13 +1,8 @@ #[macro_use] extern crate wasmer_runtime; -#[macro_use] -use wasmer_runtime::macros; - use byteorder::{ByteOrder, LittleEndian}; -use hashbrown::{hash_map::Entry, HashMap}; -use libc::c_int; -use std::cell::UnsafeCell; +use hashbrown::HashMap; use std::mem; use wasmer_runtime::{ export::{Context, Export, FuncPointer, GlobalPointer}, @@ -16,9 +11,8 @@ use wasmer_runtime::{ types::{ FuncSig, GlobalDesc, Type::{self, *}, - Value, }, - vm::{self, Func, LocalGlobal}, + vm::LocalGlobal, }; //#[cfg(test)] diff --git a/lib/emscripten/src/utils.rs b/lib/emscripten/src/utils.rs index 573c07805..b91e62876 100644 --- a/lib/emscripten/src/utils.rs +++ b/lib/emscripten/src/utils.rs @@ -3,10 +3,8 @@ use wasmer_runtime::{module::Module, Instance}; use super::env; use libc::stat; use std::ffi::CStr; -use std::mem::size_of; use std::os::raw::c_char; use std::slice; -use std::sync::Arc; /// We check if a provided module is an Emscripten generated one pub fn is_emscripten_module(module: &Module) -> bool { for (_, import_name) in &module.0.imported_functions { diff --git a/lib/runtime/src/instance.rs b/lib/runtime/src/instance.rs index 56f0c10d7..d809b9cba 100644 --- a/lib/runtime/src/instance.rs +++ b/lib/runtime/src/instance.rs @@ -350,7 +350,7 @@ impl Namespace for Instance { // TODO Remove this later, only needed for compilation till emscripten is updated impl Instance { - pub fn memory_offset_addr(&self, index: usize, offset: usize) -> *const u8 { + pub fn memory_offset_addr(&self, _index: usize, _offset: usize) -> *const u8 { unimplemented!() } } diff --git a/src/bin/wasmer.rs b/src/bin/wasmer.rs index c1d48449e..a337c4749 100644 --- a/src/bin/wasmer.rs +++ b/src/bin/wasmer.rs @@ -6,13 +6,11 @@ use std::io; use std::io::Read; use std::path::PathBuf; use std::process::exit; -use std::sync::Arc; use structopt::StructOpt; use wasmer::*; use wasmer_emscripten; -use wasmer_runtime as runtime; #[derive(Debug, StructOpt)] #[structopt(name = "wasmer", about = "WASM execution runtime.")] @@ -81,7 +79,7 @@ fn execute_wasm(options: &Run) -> Result<(), String> { let emscripten_globals = wasmer_emscripten::EmscriptenGlobals::new(); - let mut import_object = if abi == webassembly::InstanceABI::Emscripten { + let import_object = if abi == webassembly::InstanceABI::Emscripten { wasmer_emscripten::generate_emscripten_env(&emscripten_globals) } else { wasmer_runtime::import::Imports::new()