afd980b4f6
* Remove `WrappedCallable` indirection At this point `Func` has evolved quite a bit since inception and the `WrappedCallable` trait I don't believe is needed any longer. This should help clean up a few entry points by having fewer traits in play. * Remove the `Callable` trait This commit removes the `wasmtime::Callable` trait, changing the signature of `Func::new` to take an appropriately typed `Fn`. Additionally the function now always takes `&Caller` like `Func::wrap` optionally can, to empower `Func::new` to have the same capabilities of `Func::wrap`. * Add a test for an already-fixed issue Closes #849 * rustfmt * Update more locations for `Callable` * rustfmt * Remove a stray leading borrow * Review feedback * Remove unneeded `wasmtime_call_trampoline` shim
55 lines
1.4 KiB
Rust
55 lines
1.4 KiB
Rust
use wasmtime::*;
|
|
|
|
#[test]
|
|
fn same_import_names_still_distinct() -> anyhow::Result<()> {
|
|
const WAT: &str = r#"
|
|
(module
|
|
(import "" "" (func $a (result i32)))
|
|
(import "" "" (func $b (result f32)))
|
|
(func (export "foo") (result i32)
|
|
call $a
|
|
call $b
|
|
i32.trunc_f32_u
|
|
i32.add)
|
|
)
|
|
"#;
|
|
|
|
let store = Store::default();
|
|
let module = Module::new(&store, WAT)?;
|
|
|
|
let imports = [
|
|
Func::new(
|
|
&store,
|
|
FuncType::new(Box::new([]), Box::new([ValType::I32])),
|
|
|_, params, results| {
|
|
assert!(params.is_empty());
|
|
assert_eq!(results.len(), 1);
|
|
results[0] = 1i32.into();
|
|
Ok(())
|
|
},
|
|
)
|
|
.into(),
|
|
Func::new(
|
|
&store,
|
|
FuncType::new(Box::new([]), Box::new([ValType::F32])),
|
|
|_, params, results| {
|
|
assert!(params.is_empty());
|
|
assert_eq!(results.len(), 1);
|
|
results[0] = 2.0f32.into();
|
|
Ok(())
|
|
},
|
|
)
|
|
.into(),
|
|
];
|
|
let instance = Instance::new(&module, &imports)?;
|
|
|
|
let func = instance.get_export("foo").unwrap().func().unwrap();
|
|
let results = func.call(&[])?;
|
|
assert_eq!(results.len(), 1);
|
|
match results[0] {
|
|
Val::I32(n) => assert_eq!(n, 3),
|
|
_ => panic!("unexpected type of return"),
|
|
}
|
|
Ok(())
|
|
}
|