diff --git a/lib/jit/src/context.rs b/lib/jit/src/context.rs index f2c4f0c1ad..1b36f9bc0a 100644 --- a/lib/jit/src/context.rs +++ b/lib/jit/src/context.rs @@ -93,7 +93,7 @@ impl Context { &mut *self.compiler, &data, &mut self.namespace, - Rc::clone(&mut self.global_exports), + Rc::clone(&self.global_exports), ) } @@ -170,11 +170,11 @@ impl Context { instance_name: &str, field: &str, ) -> Result { - let mut instance = self + let instance = self .get_instance(&instance_name) .map_err(ContextError::Instance)? .clone(); - self.get(&mut instance, field).map_err(ContextError::Action) + self.get(&instance, field).map_err(ContextError::Action) } /// Get the value of an exported global variable from an instance. diff --git a/lib/jit/src/link.rs b/lib/jit/src/link.rs index a9a1af92cf..9fbfbdc544 100644 --- a/lib/jit/src/link.rs +++ b/lib/jit/src/link.rs @@ -44,7 +44,7 @@ pub fn link_module( signature, import_signature) )); } - dependencies.insert(InstanceHandle::from_vmctx(vmctx)); + dependencies.insert(unsafe { InstanceHandle::from_vmctx(vmctx) }); function_imports.push(VMFunctionImport { body: address, vmctx, @@ -82,7 +82,7 @@ pub fn link_module( module_name, field, ))); } - dependencies.insert(InstanceHandle::from_vmctx(vmctx)); + dependencies.insert(unsafe { InstanceHandle::from_vmctx(vmctx) }); table_imports.push(VMTableImport { from: definition, vmctx, @@ -136,7 +136,7 @@ pub fn link_module( } assert!(memory.offset_guard_size >= import_memory.offset_guard_size); - dependencies.insert(InstanceHandle::from_vmctx(vmctx)); + dependencies.insert(unsafe { InstanceHandle::from_vmctx(vmctx) }); memory_imports.push(VMMemoryImport { from: definition, vmctx, @@ -180,7 +180,7 @@ pub fn link_module( module_name, field ))); } - dependencies.insert(InstanceHandle::from_vmctx(vmctx)); + dependencies.insert(unsafe { InstanceHandle::from_vmctx(vmctx) }); global_imports.push(VMGlobalImport { from: definition }); } }, diff --git a/lib/runtime/src/instance.rs b/lib/runtime/src/instance.rs index 21fe4d5085..c3a25f70a0 100644 --- a/lib/runtime/src/instance.rs +++ b/lib/runtime/src/instance.rs @@ -760,8 +760,8 @@ impl InstanceHandle { /// Create a new `InstanceHandle` pointing at the instance /// pointed to by the given `VMContext` pointer. - pub fn from_vmctx(vmctx: *mut VMContext) -> Self { - let instance = unsafe { (&mut *vmctx).instance() }; + pub unsafe fn from_vmctx(vmctx: *mut VMContext) -> Self { + let instance = (&mut *vmctx).instance(); instance.refcount += 1; Self { instance } } diff --git a/src/wasm2obj.rs b/src/wasm2obj.rs index 89e584d991..57eaacf612 100644 --- a/src/wasm2obj.rs +++ b/src/wasm2obj.rs @@ -11,7 +11,7 @@ unstable_features )] #![warn(unused_import_braces)] -#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] +#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../clippy.toml")))] #![cfg_attr( feature = "cargo-clippy", allow(clippy::new_without_default, clippy::new_without_default_derive) diff --git a/src/wasmtime.rs b/src/wasmtime.rs index 5128f248dc..a202585e7c 100644 --- a/src/wasmtime.rs +++ b/src/wasmtime.rs @@ -12,7 +12,7 @@ unstable_features )] #![warn(unused_import_braces)] -#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))] +#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../clippy.toml")))] #![cfg_attr( feature = "cargo-clippy", allow(clippy::new_without_default, clippy::new_without_default_derive)