Additional clean up, cargo update to fix merge issue

This commit is contained in:
Mark McCaskey 2019-12-18 15:24:42 -05:00
parent 4539ef44d0
commit 7d77511ad5
3 changed files with 366 additions and 374 deletions

726
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1252,12 +1252,6 @@ pub struct WasiState {
pub envs: Vec<Vec<u8>>,
}
impl Clone for WasiState {
fn clone(&self) -> Self {
unimplemented!()
}
}
impl WasiState {
/// Create a [`WasiStateBuilder`] to construct a validated instance of
/// [`WasiState`].

View File

@ -390,13 +390,7 @@ fn execute_wasi(
}
let wasi_state = wasi_state_builder.build().map_err(|e| format!("{:?}", e))?;
let import_object = wasmer_wasi::generate_import_object_from_state(wasi_state, wasi_version); /*wasmer_wasi::generate_import_object_for_version(
wasi_version,
args,
envs,
preopened_files,
mapped_dirs,
);*/
let import_object = wasmer_wasi::generate_import_object_from_state(wasi_state, wasi_version);
#[allow(unused_mut)] // mut used in feature
let mut instance = module