fix formatting

This commit is contained in:
Lachlan Sneff
2019-01-21 09:59:53 -08:00
parent 6e9b002363
commit 8484199d29
2 changed files with 5 additions and 7 deletions

View File

@ -51,7 +51,8 @@ impl Instance {
// Initialize the vm::Ctx in-place after the backing // Initialize the vm::Ctx in-place after the backing
// has been boxed. // has been boxed.
*inner.vmctx = unsafe { vm::Ctx::new(&mut inner.backing, &mut inner.import_backing, &module) }; *inner.vmctx =
unsafe { vm::Ctx::new(&mut inner.backing, &mut inner.import_backing, &module) };
let mut instance = Instance { let mut instance = Instance {
module, module,

View File

@ -1,9 +1,7 @@
pub use crate::{ pub use crate::{
backing::{ImportBacking, LocalBacking}, backing::{ImportBacking, LocalBacking},
module::ModuleInner, module::ModuleInner,
types::{ types::{LocalMemoryIndex, LocalOrImport, MemoryIndex, TableIndex},
MemoryIndex, LocalMemoryIndex, LocalOrImport,
},
}; };
use std::{ffi::c_void, mem, ptr, slice}; use std::{ffi::c_void, mem, ptr, slice};
@ -34,7 +32,6 @@ pub struct Ctx {
pub(crate) local_backing: *mut LocalBacking, pub(crate) local_backing: *mut LocalBacking,
pub(crate) import_backing: *mut ImportBacking, pub(crate) import_backing: *mut ImportBacking,
module: *const ModuleInner, module: *const ModuleInner,
pub data: *mut c_void, pub data: *mut c_void,
pub data_finalizer: Option<extern "C" fn(data: *mut c_void)>, pub data_finalizer: Option<extern "C" fn(data: *mut c_void)>,
@ -97,7 +94,7 @@ impl Ctx {
LocalOrImport::Local(local_mem_index) => { LocalOrImport::Local(local_mem_index) => {
let local_backing = unsafe { &mut *self.local_backing }; let local_backing = unsafe { &mut *self.local_backing };
&mut local_backing.memories[local_mem_index][..] &mut local_backing.memories[local_mem_index][..]
}, }
LocalOrImport::Import(import_mem_index) => { LocalOrImport::Import(import_mem_index) => {
let import_backing = unsafe { &mut *self.import_backing }; let import_backing = unsafe { &mut *self.import_backing };
let vm_memory_import = import_backing.memories[import_mem_index].clone(); let vm_memory_import = import_backing.memories[import_mem_index].clone();
@ -106,7 +103,7 @@ impl Ctx {
slice::from_raw_parts_mut(memory.base, memory.size) slice::from_raw_parts_mut(memory.base, memory.size)
} }
}, }
} }
} }
} }