Merge remote-tracking branch 'origin/master' into feature/remove-wasm…

…-trap-info
wasmerio · Feb 10, 2020 · e17d8f2 · e17d8f2
2 parents e0aafbe + 4a63e09
commit e17d8f2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -307,7 +307,7 @@ dep-graph:
 	cargo deps --optional-deps --filter wasmer-wasi wasmer-wasi-tests wasmer-kernel-loader wasmer-dev-utils wasmer-llvm-backend wasmer-emscripten wasmer-emscripten-tests wasmer-runtime-core wasmer-runtime wasmer-middleware-common wasmer-middleware-common-tests wasmer-singlepass-backend wasmer-clif-backend wasmer --manifest-path Cargo.toml | dot -Tpng > wasmer_depgraph.png
 
 docs:
-	cargo doc --features=backend-singlepass,backend-cranelift,backend-llvm,docs,wasi,managed --all --no-deps
+	cargo doc --features=backend-singlepass,backend-cranelift,backend-llvm,docs,wasi,managed --all --document-private-items --no-deps
 	cd lib/runtime-c-api/ && doxygen doxyfile && cd ..
 	mkdir -p api-docs
 	mkdir -p api-docs/c

diff --git a/lib/runtime-c-api/tests/test-import-object b/lib/runtime-c-api/tests/test-import-object
diff --git a/lib/runtime-core/src/memory/mod.rs b/lib/runtime-core/src/memory/mod.rs
@@ -109,7 +109,7 @@ impl Memory {
     }
 
     /// Return a "view" of the currently accessible memory. By
-    /// default, the view is unsyncronized, using regular memory
+    /// default, the view is unsynchronized, using regular memory
     /// accesses. You can force a memory view to use atomic accesses
     /// by calling the [`atomically`] method.
     ///