Merge branch 'master' into android

wasmerio · Mar 23, 2020 · 9cdb49d · 9cdb49d
2 parents 18be0f2 + e695ecb
commit 9cdb49d
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 123 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml
@@ -23,7 +23,7 @@ byteorder = "1.3.2"
 nix = "0.15.0"
 libc = "0.2.60"
 rayon = "1.1"
-wasm-debug = { optional = true, version = "0.1" }
+wasm-debug = { optional = true, version = "0.2" }
 
 # Dependencies for caching.
 [dependencies.serde]

diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml
@@ -12,8 +12,8 @@ readme = "README.md"
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.16.2", features = ["generate-debug-information-no-export-symbols"] }
 wasmparser = "0.51.3"
-smallvec = "0.6"
-goblin = "0.0.24"
+smallvec = "1"
+goblin = "0.1"
 libc = "0.2.60"
 byteorder = "1"
 

diff --git a/lib/middleware-common-tests/Cargo.toml b/lib/middleware-common-tests/Cargo.toml
@@ -21,7 +21,7 @@ singlepass = ["wasmer-singlepass-backend"]
 
 [dev-dependencies]
 wabt = "0.9.1"
-criterion = "0.2"
+criterion = "0.3"
 
 [[bench]]
 name = "metering_benchmark"

diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml
@@ -18,10 +18,10 @@ lazy_static = "1.4"
 errno = "0.2"
 libc = "0.2.68"
 hex = "0.4"
-smallvec = "0.6"
+smallvec = "1"
 bincode = "1.1"
-wasm-debug = { optional = true, version = "0.1.0" }
-target-lexicon = "0.9"
+wasm-debug = { optional = true, version = "0.2.0" }
+target-lexicon = "0.10"
 
 [dependencies.indexmap]
 version = "1.2"

diff --git a/lib/runtime-core/src/codegen.rs b/lib/runtime-core/src/codegen.rs
@@ -410,7 +410,7 @@ impl MiddlewareChain {
         };
         sink.push(ev);
         for m in &mut self.chain {
-            let prev: SmallVec<[Event; 2]> = sink.buffer.drain().collect();
+            let prev: SmallVec<[Event; 2]> = sink.buffer.drain(..).collect();
             for ev in prev {
                 m.feed_event(ev, module_info, &mut sink, source_loc)?;
             }

diff --git a/lib/runtime/Cargo.toml b/lib/runtime/Cargo.toml
@@ -34,7 +34,7 @@ version = "1.0"
 
 [dev-dependencies]
 tempfile = "3.1"
-criterion = "0.2"
+criterion = "0.3"
 wabt = "0.9.1"
 
 [dependencies.wasmer-llvm-backend]

diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml
@@ -18,7 +18,7 @@ lazy_static = "1.4"
 byteorder = "1.3"
 nix = "0.15"
 libc = "0.2.68"
-smallvec = "0.6"
+smallvec = "1"
 serde = "1.0"
 serde_derive = "1.0"
 bincode = "1.2"