From 26d77cc01e68658a49cd6fefcc2eea18163ea2b0 Mon Sep 17 00:00:00 2001 From: Nick Fitzgerald Date: Mon, 25 Sep 2023 12:28:17 -0700 Subject: [PATCH] cargo fmt --- crates/wasmtime/src/externals/global.rs | 5 ++--- crates/wasmtime/src/func.rs | 4 +--- crates/wasmtime/src/trampoline/global.rs | 5 ++--- crates/wasmtime/src/values.rs | 4 +--- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/crates/wasmtime/src/externals/global.rs b/crates/wasmtime/src/externals/global.rs index ef5cc730f14f..fb089ba9f52b 100644 --- a/crates/wasmtime/src/externals/global.rs +++ b/crates/wasmtime/src/externals/global.rs @@ -154,9 +154,8 @@ impl Global { Val::F32(f) => *definition.as_u32_mut() = f, Val::F64(f) => *definition.as_u64_mut() = f, Val::FuncRef(f) => { - *definition.as_func_ref_mut() = f.map_or(ptr::null_mut(), |f| { - f.vm_func_ref(store).as_ptr().cast() - }); + *definition.as_func_ref_mut() = + f.map_or(ptr::null_mut(), |f| f.vm_func_ref(store).as_ptr().cast()); } Val::ExternRef(x) => { let old = mem::replace(definition.as_externref_mut(), x.map(|x| x.inner)); diff --git a/crates/wasmtime/src/func.rs b/crates/wasmtime/src/func.rs index 5c35f1616c50..8e3a39d004bf 100644 --- a/crates/wasmtime/src/func.rs +++ b/crates/wasmtime/src/func.rs @@ -946,9 +946,7 @@ impl Func { /// this function is properly rooted within it. Additionally this function /// should not be liberally used since it's a very low-level knob. pub unsafe fn to_raw(&self, mut store: impl AsContextMut) -> *mut c_void { - self.vm_func_ref(store.as_context_mut().0) - .as_ptr() - .cast() + self.vm_func_ref(store.as_context_mut().0).as_ptr().cast() } /// Invokes this function with the `params` given, returning the results diff --git a/crates/wasmtime/src/trampoline/global.rs b/crates/wasmtime/src/trampoline/global.rs index 39880a485559..50a77811d1e4 100644 --- a/crates/wasmtime/src/trampoline/global.rs +++ b/crates/wasmtime/src/trampoline/global.rs @@ -53,9 +53,8 @@ pub fn generate_global_export( Val::F64(x) => *global.as_f64_bits_mut() = x, Val::V128(x) => *global.as_u128_mut() = x.into(), Val::FuncRef(f) => { - *global.as_func_ref_mut() = f.map_or(ptr::null_mut(), |f| { - f.vm_func_ref(store).as_ptr() - }) + *global.as_func_ref_mut() = + f.map_or(ptr::null_mut(), |f| f.vm_func_ref(store).as_ptr()) } Val::ExternRef(x) => *global.as_externref_mut() = x.map(|x| x.inner), } diff --git a/crates/wasmtime/src/values.rs b/crates/wasmtime/src/values.rs index 8f20b27bf7f2..d5605e962dda 100644 --- a/crates/wasmtime/src/values.rs +++ b/crates/wasmtime/src/values.rs @@ -194,9 +194,7 @@ impl Val { if !f.comes_from_same_store(store) { bail!("cross-`Store` values are not supported in tables"); } - Ok(TableElement::FuncRef( - f.vm_func_ref(store).as_ptr(), - )) + Ok(TableElement::FuncRef(f.vm_func_ref(store).as_ptr())) } (Val::FuncRef(None), ValType::FuncRef) => Ok(TableElement::FuncRef(ptr::null_mut())), (Val::ExternRef(Some(x)), ValType::ExternRef) => {