Merge remote-tracking branch 'origin/master' into no_std

2018-03-12 12:55:57 -07:00
parent 5ffdc51742 11eddafef8
commit 4a3077d638
138 changed files with 3795 additions and 1168 deletions
--- a/lib/wasm/src/environ/spec.rs
+++ b/lib/wasm/src/environ/spec.rs
@@ -148,7 +148,7 @@ pub trait FuncEnvironment {
    ) -> ir::Value;
 }

-/// An object satisfyng the `ModuleEnvironment` trait can be passed as argument to the
+/// An object satisfying the `ModuleEnvironment` trait can be passed as argument to the
 /// [`translate_module`](fn.translate_module.html) function. These methods should not be called
 /// by the user, they are only for `cretonne-wasm` internal use.
 pub trait ModuleEnvironment<'data> {