T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the wasmtime_api library to match the containing wasmtime crate (#594)

Browse Source 
* Rename the `wasmtime_api` library to match the containing `wasmtime` crate

Commit d9ca508f80 renamed the
`wasmtime-api` crate to `wasmtime`, but left the name of the library it
contains as `wasmtime_api`.

It's fairly unusual for a crate to contain a library with a different
name, and it results in rather confusing error messages for a user; if
you list `wasmtime = "0.7"` in `Cargo.toml`, you can't `use
wasmtime::*`, you have to `use wasmtime_api::*;`.

Rename the `wasmtime_api` library to `wasmtime`.

* Stop renaming wasmtime to api on imports

Various users renamed the crate formerly known as wasmtime_api to api,
and then used api:: prefixes everywhere; change those all to wasmtime::
and drop the renaming.
This commit is contained in:
Josh Triplett
2019-11-19 14:47:39 -08:00
committed by Dan Gohman
parent 58dd4c6c88
commit 2635ccb742
21 changed files with 70 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/interface-types/src/lib.rs
View File

@@ -12,7 +12,6 @@ use cranelift_codegen::ir;
use std::convert::TryFrom;
use std::str;
use wasm_webidl_bindings::ast;
use wasmtime_api as api;
use wasmtime_jit::RuntimeValue;
use wasmtime_runtime::{Export, InstanceHandle};
@@ -126,7 +125,7 @@ impl ModuleData {
/// wasm interface types.
pub fn invoke_export(
&self,
instance: &api::HostRef<api::Instance>,
instance: &wasmtime::HostRef<wasmtime::Instance>,
export: &str,
args: &[Value],
) -> Result<Vec<Value>> {
@@ -153,7 +152,7 @@ impl ModuleData {
Ok(values) => values
.to_vec()
.into_iter()
.map(|v: api::Val| v.into())
.map(|v: wasmtime::Val| v.into())
.collect::<Vec<RuntimeValue>>(),
Err(trap) => bail!("trapped: {:?}", trap),
};
@@ -316,7 +315,7 @@ trait TranslateContext {
unsafe fn get_memory(&mut self) -> Result<&mut [u8]>;
}
struct InstanceTranslateContext(pub api::HostRef<api::Instance>);
struct InstanceTranslateContext(pub wasmtime::HostRef<wasmtime::Instance>);
impl TranslateContext for InstanceTranslateContext {
fn invoke_alloc(&mut self, alloc_func_name: &str, len: i32) -> Result<i32> {
@@ -328,7 +327,7 @@ impl TranslateContext for InstanceTranslateContext {
.func()
.ok_or_else(|| format_err!("`{}` is not a (alloc) function", alloc_func_name))?
.clone();
let alloc_args = vec![api::Val::I32(len)];
let alloc_args = vec![wasmtime::Val::I32(len)];
let results = match alloc.borrow().call(&alloc_args) {
Ok(values) => values,
Err(trap) => bail!("trapped: {:?}", trap),
@@ -337,7 +336,7 @@ impl TranslateContext for InstanceTranslateContext {
bail!("allocator function wrong number of results");
}
Ok(match results[0] {
api::Val::I32(i) => i,
wasmtime::Val::I32(i) => i,
_ => bail!("allocator function bad return type"),
})
}