Merge branch 'master' into c-api-extract-instance_context-from-instance

CHANGELOG.md

@@ -5,6 +5,7 @@ All PRs to the Wasmer repository must add to this file.
 Blocks of changes will separated by version increments.
 
 ## **[Unreleased]**
+- [#609](https://github.com/wasmerio/wasmer/issues/609) Update dependencies
 
 ## 0.6.0 - 2019-07-31
 - [#603](https://github.com/wasmerio/wasmer/pull/603) Update Wapm-cli, bump version numbers

Cargo.toml

@@ -19,11 +19,10 @@ include = [
 ]
 
 [dependencies]
-byteorder = "1.3.1"
+byteorder = "1.3.2"
 errno = "0.2.4"
-structopt = "0.2.11"
+structopt = "0.2.18"
 wabt = "0.9.0"
-hashbrown = "0.1.8"
 wasmer-clif-backend = { path = "lib/clif-backend" }
 wasmer-singlepass-backend = { path = "lib/singlepass-backend", optional = true }
 wasmer-middleware-common = { path = "lib/middleware-common" }
@@ -62,7 +61,7 @@ members = [
 
 [build-dependencies]
 wabt = "0.9.0"
-glob = "0.2.11"
+glob = "0.3.0"
 rustc_version = "0.2.3"
 
 [features]

lib/clif-backend/Cargo.toml

@@ -15,26 +15,26 @@ cranelift-codegen = { version = "0.31" }
 cranelift-entity = { version = "0.31" }
 cranelift-frontend = { package = "wasmer-clif-fork-frontend", version = "0.33" }
 cranelift-wasm = { package = "wasmer-clif-fork-wasm", version = "0.33" }
-hashbrown = "0.1"
 target-lexicon = "0.4.0"
 wasmparser = "0.35.1"
-byteorder = "1"
+byteorder = "1.3.2"
-nix = "0.14.0"
+nix = "0.14.1"
-libc = "0.2.49"
+libc = "0.2.60"
-rayon = "1.0"
+rayon = "1.1.0"
 
 # Dependencies for caching.
 [dependencies.serde]
-version = "1.0"
+version = "1.0.98"
+features = ["rc"]
 [dependencies.serde_derive]
-version = "1.0"
+version = "1.0.98"
 [dependencies.serde_bytes]
-version = "0.10"
+version = "0.11.1"
 [dependencies.serde-bench]
 version = "0.0.7"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] }
+winapi = { version = "0.3.7", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] }
 wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.6.0" }
 
 [features]

lib/clif-backend/src/cache.rs

@@ -1,6 +1,6 @@
 use crate::relocation::{ExternalRelocation, TrapSink};
 
-use hashbrown::HashMap;
+use std::collections::HashMap;
 use std::sync::Arc;
 use wasmer_runtime_core::{
     backend::{sys::Memory, CacheGen},

lib/clif-backend/src/trampoline.rs

@@ -5,7 +5,7 @@ use cranelift_codegen::{
     ir::{self, InstBuilder},
     isa, Context,
 };
-use hashbrown::HashMap;
+use std::collections::HashMap;
 use std::{iter, mem, ptr::NonNull};
 use wasmer_runtime_core::{
     backend::sys::{Memory, Protect},

lib/dev-utils/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2018"
 repository = "https://github.com/wasmerio/wasmer"
 
 [dependencies]
-libc = "0.2.49"
+libc = "0.2.60"

lib/emscripten-tests/Cargo.toml

@@ -20,7 +20,7 @@ wabt = "0.9.0"
 wasmer-dev-utils = { path = "../dev-utils", version = "0.6.0"}
 
 [build-dependencies]
-glob = "0.2.11"
+glob = "0.3.0"
 
 [features]
 clif = []

lib/emscripten/Cargo.toml

@@ -8,15 +8,14 @@ repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
 
 [dependencies]
-byteorder = "1"
+byteorder = "1.3.2"
-hashbrown = "0.1"
+lazy_static = "1.3.0"
-lazy_static = "1.2.0"
+libc = "0.2.60"
-libc = "0.2.49"
+time = "0.1.42"
-time = "0.1.41"
 wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
 
 [target.'cfg(windows)'.dependencies]
-rand = "0.6"
+rand = "0.7.0"
 
 [features]
 debug = ["wasmer-runtime-core/debug"]

lib/emscripten/src/lib.rs

@@ -3,9 +3,9 @@
 #[macro_use]
 extern crate wasmer_runtime_core;
 
-use hashbrown::HashMap;
 use lazy_static::lazy_static;
 use std::cell::UnsafeCell;
+use std::collections::HashMap;
 use std::path::PathBuf;
 use std::{f64, ffi::c_void};
 use wasmer_runtime_core::{

lib/kernel-loader/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["Heyang Zhou <zhy20000919@hotmail.com>"]
 edition = "2018"
 
 [dependencies]
-libc = "0.2.49"
+libc = "0.2.60"
 wasmer-runtime-core = { path = "../runtime-core" }

lib/llvm-backend/Cargo.toml

@@ -8,12 +8,11 @@ readme = "README.md"
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
 wasmparser = "0.35.1"
-hashbrown = "0.1.8"
+smallvec = "0.6.10"
-smallvec = "0.6.8"
+goblin = "0.0.24"
-goblin = "0.0.20"
+libc = "0.2.60"
-libc = "0.2.49"
+nix = "0.14.1"
-nix = "0.14.0"
+capstone = { version = "0.6.0", optional = true }
-capstone = { version = "0.5.0", optional = true }
 
 [dependencies.inkwell]
 git = "https://github.com/wasmerio/inkwell"
@@ -22,12 +21,12 @@ default-features = false
 features = ["llvm8-0", "target-x86"]
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["memoryapi"] }
+winapi = { version = "0.3.7", features = ["memoryapi"] }
 
 [build-dependencies]
 cc = "1.0"
-lazy_static = "1.2.0"
+lazy_static = "1.3.0"
-regex = "1.1.0"
+regex = "1.2.0"
 semver = "0.9"
 rustc_version = "0.2.3"
 

lib/llvm-backend/src/intrinsics.rs

@@ -1,4 +1,3 @@
-use hashbrown::HashMap;
 use inkwell::{
     builder::Builder,
     context::Context,
@@ -9,6 +8,7 @@ use inkwell::{
     values::{BasicValue, BasicValueEnum, FloatValue, FunctionValue, IntValue, PointerValue},
     AddressSpace,
 };
+use std::collections::HashMap;
 use std::marker::PhantomData;
 use wasmer_runtime_core::{
     memory::MemoryType,

lib/runtime-abi/Cargo.toml

@@ -8,12 +8,11 @@ repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
 
 [dependencies]
-libc = "0.2.50"
+libc = "0.2.60"
 wasmer-runtime-core = { path = "../runtime-core" }
-hashbrown = "0.1"
 failure = "0.1"
 tar = "0.4"
-wasmparser = "0.34.0"
+wasmparser = "0.35.1"
 zstd = "0.4"
 
 # [target.'cfg(unix)'.dependencies.zbox]

lib/runtime-abi/src/vfs/vfs.rs

@@ -1,7 +1,7 @@
 use crate::vfs::file_like::FileLike;
 use crate::vfs::vfs_header::{header_from_bytes, ArchiveType, CompressionType};
 use crate::vfs::virtual_file::VirtualFile;
-use hashbrown::HashMap;
+use std::collections::HashMap;
 use std::cell::RefCell;
 use std::io;
 use std::io::Read;

lib/runtime-c-api/Cargo.toml

@@ -12,7 +12,7 @@ readme = "README.md"
 crate-type = ["cdylib", "rlib", "staticlib"]
 
 [dependencies]
-libc = "0.2"
+libc = "0.2.60"
 
 [dependencies.wasmer-runtime]
 path = "../runtime"
@@ -27,4 +27,4 @@ debug = ["wasmer-runtime/debug"]
 llvm = ["wasmer-runtime/llvm"]
 
 [build-dependencies]
-cbindgen = "0.8"
+cbindgen = "0.9.0"

lib/runtime-c-api/tests/runtime_c_api_tests.rs

@@ -4,19 +4,17 @@ use std::process::Command;
 fn test_c_api() {
     let project_tests_dir = concat!(env!("CARGO_MANIFEST_DIR"), "/tests");
 
-    run_command("cmake", project_tests_dir, Some("."));
+    run_command("cmake", project_tests_dir, vec!["."]);
-    run_command("make", project_tests_dir, Some("-Wdev -Werror=dev"));
+    run_command("make", project_tests_dir, vec!["-Wdev", "-Werror=dev"]);
-    run_command("make", project_tests_dir, Some("test"));
+    run_command("make", project_tests_dir, vec!["test", "ARGS=\"-V\""]);
 }
 
-fn run_command(command_str: &str, dir: &str, arg: Option<&str>) {
+fn run_command(command_str: &str, dir: &str, args: Vec<&str>) {
-    println!("Running command: `{}` arg: {:?}", command_str, arg);
+    println!("Running command: `{}` args: {:?}", command_str, args);
 
     let mut command = Command::new(command_str);
 
-    if let Some(a) = arg {
+    command.args(&args);
-        command.arg(a);
-    }
 
     command.current_dir(dir);
 

lib/runtime-c-api/tests/test-exported-memory.c

@@ -42,8 +42,9 @@ int main()
     assert(export_length == 5);
 
     // Get the `memory` export.
-    wasmer_export_t *export = wasmer_exports_get(exports, 1);
+    wasmer_export_t *export = wasmer_exports_get(exports, 0);
     wasmer_import_export_kind kind = wasmer_export_kind(export);
+    printf("Wasmer import export kind: %d (Memory is %d)\n", kind, WASM_MEMORY);
     assert(kind == WASM_MEMORY);
 
     wasmer_byte_array export_name = wasmer_export_name(export);

lib/runtime-core/Cargo.toml

@@ -8,46 +8,46 @@ repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
 
 [dependencies]
-nix = "0.14.0"
+nix = "0.14.1"
 page_size = "0.4.1"
 wasmparser = "0.35.1"
-parking_lot = "0.7.1"
+parking_lot = "0.9.0"
-lazy_static = "1.2.0"
+lazy_static = "1.3.0"
-indexmap = "1.0.2"
 errno = "0.2.4"
-libc = "0.2.49"
+libc = "0.2.60"
 hex = "0.3.2"
-smallvec = "0.6.9"
+smallvec = "0.6.10"
 bincode = "1.1"
 colored = "1.8"
 
+[dependencies.indexmap]
+version = "1.0.2"
+features = ["serde-1"]
+
 # Dependencies for caching.
 [dependencies.serde]
-version = "1.0"
+version = "1.0.98"
 # This feature is required for serde to support serializing/deserializing reference counted pointers (e.g. Rc and Arc).
 features = ["rc"]
 [dependencies.serde_derive]
-version = "1.0"
+version = "1.0.98"
 [dependencies.serde_bytes]
-version = "0.10"
+version = "0.11.1"
 [dependencies.serde-bench]
 version = "0.0.7"
 [dependencies.blake2b_simd]
-version = "0.4.1"
+version = "0.5.5"
 [dependencies.digest]
-version = "0.8.0"
+version = "0.8.1"
-[dependencies.hashbrown]
-version = "0.1"
-features = ["serde"]
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["memoryapi"] }
+winapi = { version = "0.3.7", features = ["memoryapi"] }
 
 [dev-dependencies]
 field-offset = "0.1.1"
 
 [build-dependencies]
-blake2b_simd = "0.4.1"
+blake2b_simd = "0.5.5"
 rustc_version = "0.2.3"
 cc = "1.0"
 

lib/runtime-core/src/backend.rs

@@ -15,7 +15,7 @@ use crate::{
 };
 use std::{any::Any, ptr::NonNull};
 
-use hashbrown::HashMap;
+use std::collections::HashMap;
 
 pub mod sys {
     pub use crate::sys::*;

lib/runtime-core/src/export.rs

@@ -2,7 +2,7 @@ use crate::{
     global::Global, instance::InstanceInner, memory::Memory, module::ExportIndex,
     module::ModuleInner, table::Table, types::FuncSig, vm,
 };
-use hashbrown::hash_map;
+use indexmap::map::Iter as IndexMapIter;
 use std::sync::Arc;
 
 #[derive(Debug, Copy, Clone)]
@@ -41,7 +41,7 @@ impl FuncPointer {
 
 pub struct ExportIter<'a> {
     inner: &'a InstanceInner,
-    iter: hash_map::Iter<'a, String, ExportIndex>,
+    iter: IndexMapIter<'a, String, ExportIndex>,
     module: &'a ModuleInner,
 }
 

lib/runtime-core/src/import.rs

@@ -1,6 +1,6 @@
 use crate::export::Export;
-use hashbrown::{hash_map::Entry, HashMap};
 use std::collections::VecDeque;
+use std::collections::{hash_map::Entry, HashMap};
 use std::{
     cell::{Ref, RefCell},
     ffi::c_void,

lib/runtime-core/src/module.rs

@@ -14,8 +14,8 @@ use crate::{
 };
 
 use crate::backend::CacheGen;
-use hashbrown::HashMap;
 use indexmap::IndexMap;
+use std::collections::HashMap;
 use std::sync::Arc;
 
 /// This is used to instantiate a new WebAssembly module.
@@ -40,7 +40,7 @@ pub struct ModuleInfo {
     pub imported_tables: Map<ImportedTableIndex, (ImportName, TableDescriptor)>,
     pub imported_globals: Map<ImportedGlobalIndex, (ImportName, GlobalDescriptor)>,
 
-    pub exports: HashMap<String, ExportIndex>,
+    pub exports: IndexMap<String, ExportIndex>,
 
     pub data_initializers: Vec<DataInitializer>,
     pub elem_initializers: Vec<TableInitializer>,

lib/runtime-core/src/parse.rs

@@ -14,7 +14,7 @@ use crate::{
     },
     units::Pages,
 };
-use hashbrown::HashMap;
+use std::collections::HashMap;
 use std::fmt::Debug;
 use std::sync::{Arc, RwLock};
 use wasmparser::{

lib/runtime-core/src/sig_registry.rs

@@ -2,9 +2,9 @@ use crate::{
     structures::Map,
     types::{FuncSig, SigIndex},
 };
-use hashbrown::HashMap;
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
+use std::collections::HashMap;
 use std::sync::Arc;
 
 lazy_static! {

lib/runtime-core/src/sys/mod.rs

@@ -16,7 +16,7 @@ use serde::{
     Deserialize, Deserializer, Serialize, Serializer,
 };
 
-use serde_bytes::Bytes;
+use serde_bytes::{ByteBuf, Bytes};
 
 use std::fmt;
 
@@ -56,7 +56,7 @@ impl<'de> Deserialize<'de> for Memory {
                     .next_element()?
                     .ok_or_else(|| de::Error::invalid_length(0, &self))?;
 
-                let bytes: Bytes = seq
+                let bytes: ByteBuf = seq
                     .next_element()?
                     .ok_or_else(|| de::Error::invalid_length(1, &self))?;
 

lib/runtime-core/src/vm.rs

@@ -14,7 +14,7 @@ use std::{
     sync::Once,
 };
 
-use hashbrown::HashMap;
+use std::collections::HashMap;
 
 /// The context of the currently running WebAssembly instance.
 ///
@@ -850,8 +850,9 @@ mod vm_ctx_tests {
         use crate::cache::Error as CacheError;
         use crate::typed_func::Wasm;
         use crate::types::{LocalFuncIndex, SigIndex};
-        use hashbrown::HashMap;
+        use indexmap::IndexMap;
         use std::any::Any;
+        use std::collections::HashMap;
         use std::ptr::NonNull;
         struct Placeholder;
         impl RunnableModule for Placeholder {
@@ -890,7 +891,7 @@ mod vm_ctx_tests {
                 imported_tables: Map::new(),
                 imported_globals: Map::new(),
 
-                exports: HashMap::new(),
+                exports: IndexMap::new(),
 
                 data_initializers: Vec::new(),
                 elem_initializers: Vec::new(),

lib/runtime/Cargo.toml

@@ -10,7 +10,7 @@ readme = "README.md"
 
 [dependencies]
 wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.6.0", optional = true }
-lazy_static = "1.2.0"
+lazy_static = "1.3.0"
 memmap = "0.7.0"
 
 [dependencies.wasmer-runtime-core]
@@ -23,7 +23,7 @@ version = "0.6.0"
 optional = true
 
 [dev-dependencies]
-tempfile = "3.0.7"
+tempfile = "3.1.0"
 criterion = "0.2"
 wabt = "0.9.0"
 

lib/singlepass-backend/Cargo.toml

@@ -13,10 +13,9 @@ wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
 wasmparser = "0.35.1"
 dynasm = "0.3.2"
 dynasmrt = "0.3.1"
-lazy_static = "1.2.0"
+lazy_static = "1.3.0"
-byteorder = "1"
+byteorder = "1.3.2"
-nix = "0.14.0"
+nix = "0.14.1"
-libc = "0.2.49"
+libc = "0.2.60"
-smallvec = "0.6.9"
+smallvec = "0.6.10"
-hashbrown = "0.1"
 colored = "1.8"

lib/wasi-tests/Cargo.toml

@@ -17,7 +17,7 @@ wasmer-llvm-backend = { path = "../llvm-backend", version = "0.6.0", optional =
 
 
 [build-dependencies]
-glob = "0.2.11"
+glob = "0.3.0"
 
 [dev-dependencies]
 wasmer-clif-backend = { path = "../clif-backend", version = "0.6.0" }

lib/wasi/Cargo.toml

@@ -9,13 +9,12 @@ edition = "2018"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
-libc = "0.2.50"
+libc = "0.2.60"
-rand = "0.6.5"
+rand = "0.7.0"
 # wasmer-runtime-abi = { path = "../runtime-abi" }
-hashbrown = "0.1.8"
 generational-arena = "0.2.2"
-log = "0.4.6"
+log = "0.4.8"
-byteorder = "1.3.1"
+byteorder = "1.3.2"
 
 [target.'cfg(windows)'.dependencies]
-winapi = "0.3"
+winapi = "0.3.7"

lib/wasi/src/state.rs

@@ -8,7 +8,7 @@
 use crate::syscalls::types::*;
 use generational_arena::Arena;
 pub use generational_arena::Index as Inode;
-use hashbrown::hash_map::HashMap;
+use std::collections::HashMap;
 use std::{
     borrow::Borrow,
     cell::Cell,

lib/win-exception-handler/Cargo.toml

@@ -9,10 +9,10 @@ edition = "2018"
 
 [target.'cfg(windows)'.dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.6.0" }
-winapi = { version = "0.3", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] }
+winapi = { version = "0.3.7", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] }
-libc = "0.2.49"
+libc = "0.2.60"
 
 [build-dependencies]
-cmake = "0.1.35"
+cmake = "0.1.40"
-bindgen = "0.46.0"
+bindgen = "0.51.0"
-regex = "1.0.6"
+regex = "1.2.0"

src/bin/wasmer.rs

@@ -10,7 +10,7 @@ use std::path::PathBuf;
 use std::process::exit;
 use std::str::FromStr;
 
-use hashbrown::HashMap;
+use std::collections::HashMap;
 use structopt::StructOpt;
 
 use wasmer::*;