From b2b5e8d734a6921acc0777fbccc6143230f2c2ad Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Mon, 20 Apr 2020 09:05:28 -0700 Subject: [PATCH] Remove more obviated clone() calls. --- crates/api/src/externals.rs | 2 +- crates/api/src/linker.rs | 2 +- crates/api/src/trampoline/func.rs | 4 ++-- crates/c-api/src/extern.rs | 8 ++++---- crates/c-api/src/func.rs | 10 +++++----- crates/c-api/src/global.rs | 2 +- crates/c-api/src/instance.rs | 8 ++++---- crates/c-api/src/memory.rs | 2 +- crates/c-api/src/table.rs | 2 +- crates/c-api/src/wasi.rs | 2 +- crates/c-api/src/wat2wasm.rs | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/crates/api/src/externals.rs b/crates/api/src/externals.rs index e94fc40632b8..4ba931fd0794 100644 --- a/crates/api/src/externals.rs +++ b/crates/api/src/externals.rs @@ -374,7 +374,7 @@ impl Table { /// Returns the current size of this table. pub fn size(&self) -> u32 { - unsafe { (&*self.wasmtime_export.definition).current_elements } + unsafe { (*self.wasmtime_export.definition).current_elements } } /// Grows the size of this table by `delta` more elements, initialization diff --git a/crates/api/src/linker.rs b/crates/api/src/linker.rs index c7f83bdbf2f2..09cbe72ab20a 100644 --- a/crates/api/src/linker.rs +++ b/crates/api/src/linker.rs @@ -283,7 +283,7 @@ impl Linker { let items = self .iter() .filter(|(m, _, _)| *m == module) - .map(|(_, name, item)| (name.to_string(), item.clone())) + .map(|(_, name, item)| (name.to_string(), item)) .collect::>(); for (name, item) in items { self.define(as_module, &name, item)?; diff --git a/crates/api/src/trampoline/func.rs b/crates/api/src/trampoline/func.rs index cafe26b47cc3..0c5f36c625a7 100644 --- a/crates/api/src/trampoline/func.rs +++ b/crates/api/src/trampoline/func.rs @@ -212,7 +212,7 @@ pub fn create_handle_with_function( let pointer_type = isa.pointer_type(); let sig = match ft.get_wasmtime_signature(pointer_type) { - Some(sig) => sig.clone(), + Some(sig) => sig, None => bail!("not a supported core wasm signature {:?}", ft), }; @@ -276,7 +276,7 @@ pub unsafe fn create_handle_with_raw_function( let pointer_type = isa.pointer_type(); let sig = match ft.get_wasmtime_signature(pointer_type) { - Some(sig) => sig.clone(), + Some(sig) => sig, None => bail!("not a supported core wasm signature {:?}", ft), }; diff --git a/crates/c-api/src/extern.rs b/crates/c-api/src/extern.rs index e5d6fc615299..b882082faf99 100644 --- a/crates/c-api/src/extern.rs +++ b/crates/c-api/src/extern.rs @@ -41,10 +41,10 @@ pub extern "C" fn wasm_extern_kind(e: &wasm_extern_t) -> wasm_externkind_t { #[no_mangle] pub extern "C" fn wasm_extern_type(e: &wasm_extern_t) -> Box { let ty = match &e.which { - ExternHost::Func(f) => ExternType::Func(f.borrow().ty().clone()), - ExternHost::Global(f) => ExternType::Global(f.borrow().ty().clone()), - ExternHost::Table(f) => ExternType::Table(f.borrow().ty().clone()), - ExternHost::Memory(f) => ExternType::Memory(f.borrow().ty().clone()), + ExternHost::Func(f) => ExternType::Func(f.borrow().ty()), + ExternHost::Global(f) => ExternType::Global(f.borrow().ty()), + ExternHost::Table(f) => ExternType::Table(f.borrow().ty()), + ExternHost::Memory(f) => ExternType::Memory(f.borrow().ty()), }; Box::new(wasm_externtype_t::new(ty)) } diff --git a/crates/c-api/src/func.rs b/crates/c-api/src/func.rs index 9c9718216ac3..3c58d1ca46a3 100644 --- a/crates/c-api/src/func.rs +++ b/crates/c-api/src/func.rs @@ -246,7 +246,7 @@ fn _wasmtime_func_call( #[no_mangle] pub extern "C" fn wasm_func_type(f: &wasm_func_t) -> Box { - Box::new(wasm_functype_t::new(f.func().borrow().ty().clone())) + Box::new(wasm_functype_t::new(f.func().borrow().ty())) } #[no_mangle] @@ -272,10 +272,10 @@ pub unsafe extern "C" fn wasmtime_caller_export_get( let name = str::from_utf8(name.as_slice()).ok()?; let export = caller.caller.get_export(name)?; let which = match export { - Extern::Func(f) => ExternHost::Func(HostRef::new(f.clone())), - Extern::Global(g) => ExternHost::Global(HostRef::new(g.clone())), - Extern::Memory(m) => ExternHost::Memory(HostRef::new(m.clone())), - Extern::Table(t) => ExternHost::Table(HostRef::new(t.clone())), + Extern::Func(f) => ExternHost::Func(HostRef::new(f)), + Extern::Global(g) => ExternHost::Global(HostRef::new(g)), + Extern::Memory(m) => ExternHost::Memory(HostRef::new(m)), + Extern::Table(t) => ExternHost::Table(HostRef::new(t)), }; Some(Box::new(wasm_extern_t { which })) } diff --git a/crates/c-api/src/global.rs b/crates/c-api/src/global.rs index 4c6f025d65b3..fb3f163bab78 100644 --- a/crates/c-api/src/global.rs +++ b/crates/c-api/src/global.rs @@ -71,7 +71,7 @@ pub extern "C" fn wasm_global_as_extern(g: &wasm_global_t) -> &wasm_extern_t { #[no_mangle] pub extern "C" fn wasm_global_type(g: &wasm_global_t) -> Box { - let globaltype = g.global().borrow().ty().clone(); + let globaltype = g.global().borrow().ty(); Box::new(wasm_globaltype_t::new(globaltype)) } diff --git a/crates/c-api/src/instance.rs b/crates/c-api/src/instance.rs index 1afa3686d3d4..128e53fdf862 100644 --- a/crates/c-api/src/instance.rs +++ b/crates/c-api/src/instance.rs @@ -146,10 +146,10 @@ pub extern "C" fn wasm_instance_exports(instance: &wasm_instance_t, out: &mut wa instance .exports() .map(|e| match e.external { - Extern::Func(f) => ExternHost::Func(HostRef::new(f.clone())), - Extern::Global(f) => ExternHost::Global(HostRef::new(f.clone())), - Extern::Memory(f) => ExternHost::Memory(HostRef::new(f.clone())), - Extern::Table(f) => ExternHost::Table(HostRef::new(f.clone())), + Extern::Func(f) => ExternHost::Func(HostRef::new(f)), + Extern::Global(f) => ExternHost::Global(HostRef::new(f)), + Extern::Memory(f) => ExternHost::Memory(HostRef::new(f)), + Extern::Table(f) => ExternHost::Table(HostRef::new(f)), }) .collect() }); diff --git a/crates/c-api/src/memory.rs b/crates/c-api/src/memory.rs index ab814bc2960c..d77f01c4ea97 100644 --- a/crates/c-api/src/memory.rs +++ b/crates/c-api/src/memory.rs @@ -51,7 +51,7 @@ pub extern "C" fn wasm_memory_as_extern(m: &wasm_memory_t) -> &wasm_extern_t { #[no_mangle] pub extern "C" fn wasm_memory_type(m: &wasm_memory_t) -> Box { - let ty = m.memory().borrow().ty().clone(); + let ty = m.memory().borrow().ty(); Box::new(wasm_memorytype_t::new(ty)) } diff --git a/crates/c-api/src/table.rs b/crates/c-api/src/table.rs index 8f4c0dca043e..a52b79048b53 100644 --- a/crates/c-api/src/table.rs +++ b/crates/c-api/src/table.rs @@ -54,7 +54,7 @@ pub unsafe extern "C" fn wasm_table_new( #[no_mangle] pub extern "C" fn wasm_table_type(t: &wasm_table_t) -> Box { - let ty = t.table().borrow().ty().clone(); + let ty = t.table().borrow().ty(); Box::new(wasm_tabletype_t::new(ty)) } diff --git a/crates/c-api/src/wasi.rs b/crates/c-api/src/wasi.rs index dffb00f1bad8..a3b3ef8e8444 100644 --- a/crates/c-api/src/wasi.rs +++ b/crates/c-api/src/wasi.rs @@ -297,7 +297,7 @@ pub unsafe extern "C" fn wasi_instance_new( })), Err(e) => { *trap = Box::into_raw(Box::new(wasm_trap_t { - trap: HostRef::new(Trap::new(e.to_string())), + trap: HostRef::new(Trap::new(e)), })); None diff --git a/crates/c-api/src/wat2wasm.rs b/crates/c-api/src/wat2wasm.rs index 696ee579a8e7..4223da67da15 100644 --- a/crates/c-api/src/wat2wasm.rs +++ b/crates/c-api/src/wat2wasm.rs @@ -10,6 +10,6 @@ pub extern "C" fn wasmtime_wat2wasm( Err(_) => return bad_utf8(), }; handle_result(wat::parse_str(wat).map_err(|e| e.into()), |bytes| { - ret.set_buffer(bytes.into()) + ret.set_buffer(bytes) }) }