Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #609

Merged
merged 9 commits into from
Aug 1, 2019
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
565 changes: 286 additions & 279 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down Expand Up @@ -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]
Expand Down
18 changes: 9 additions & 9 deletions lib/clif-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
nix = "0.14.0"
libc = "0.2.49"
rayon = "1.0"
byteorder = "1.3.2"
nix = "0.14.1"
libc = "0.2.60"
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]
Expand Down
2 changes: 1 addition & 1 deletion lib/clif-backend/src/cache.rs
Original file line number Diff line number Diff line change
@@ -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},
Expand Down
2 changes: 1 addition & 1 deletion lib/clif-backend/src/trampoline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion lib/dev-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ edition = "2018"
repository = "https://github.com/wasmerio/wasmer"

[dependencies]
libc = "0.2.49"
libc = "0.2.60"
2 changes: 1 addition & 1 deletion lib/emscripten-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
11 changes: 5 additions & 6 deletions lib/emscripten/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ repository = "https://github.com/wasmerio/wasmer"
edition = "2018"

[dependencies]
byteorder = "1"
hashbrown = "0.1"
lazy_static = "1.2.0"
libc = "0.2.49"
time = "0.1.41"
byteorder = "1.3.2"
lazy_static = "1.3.0"
libc = "0.2.60"
time = "0.1.42"
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"]
2 changes: 1 addition & 1 deletion lib/emscripten/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion lib/kernel-loader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ authors = ["Heyang Zhou <[email protected]>"]
edition = "2018"

[dependencies]
libc = "0.2.49"
libc = "0.2.60"
wasmer-runtime-core = { path = "../runtime-core" }
17 changes: 8 additions & 9 deletions lib/llvm-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8"
goblin = "0.0.20"
libc = "0.2.49"
nix = "0.14.0"
capstone = { version = "0.5.0", optional = true }
smallvec = "0.6.10"
goblin = "0.0.24"
libc = "0.2.60"
nix = "0.14.1"
capstone = { version = "0.6.0", optional = true }

[dependencies.inkwell]
git = "https://github.com/wasmerio/inkwell"
Expand All @@ -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"
regex = "1.1.0"
lazy_static = "1.3.0"
regex = "1.2.0"
semver = "0.9"
rustc_version = "0.2.3"

Expand Down
2 changes: 1 addition & 1 deletion lib/llvm-backend/src/intrinsics.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use hashbrown::HashMap;
use inkwell::{
builder::Builder,
context::Context,
Expand All @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions lib/runtime-abi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
syrusakbary marked this conversation as resolved.
Show resolved Hide resolved
zstd = "0.4"

# [target.'cfg(unix)'.dependencies.zbox]
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-abi/src/vfs/vfs.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions lib/runtime-c-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -27,4 +27,4 @@ debug = ["wasmer-runtime/debug"]
llvm = ["wasmer-runtime/llvm"]

[build-dependencies]
cbindgen = "0.8"
cbindgen = "0.9.0"
2 changes: 1 addition & 1 deletion lib/runtime-c-api/tests/runtime_c_api_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fn test_c_api() {

run_command("cmake", project_tests_dir, Some("."));
run_command("make", project_tests_dir, Some("-Wdev -Werror=dev"));
run_command("make", project_tests_dir, Some("test"));
run_command("make", project_tests_dir, Some("test VERBOSE=1"));
syrusakbary marked this conversation as resolved.
Show resolved Hide resolved
}

fn run_command(command_str: &str, dir: &str, arg: Option<&str>) {
Expand Down
27 changes: 12 additions & 15 deletions lib/runtime-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,43 @@ 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"
lazy_static = "1.2.0"
parking_lot = "0.9.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 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"
[dependencies.hashbrown]
version = "0.1"
features = ["serde"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hashbrown serde feature was why I think we should re-test caching after removing hashbrown.

version = "0.8.1"

[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"

Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-core/src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-core/src/export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 std::collections::hash_map;
use std::sync::Arc;

#[derive(Debug, Copy, Clone)]
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-core/src/import.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-core/src/module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-core/src/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion lib/runtime-core/src/sig_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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! {
Expand Down
4 changes: 2 additions & 2 deletions lib/runtime-core/src/sys/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use serde::{
Deserialize, Deserializer, Serialize, Serializer,
};

use serde_bytes::Bytes;
use serde_bytes::{ByteBuf, Bytes};

use std::fmt;

Expand Down Expand Up @@ -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))?;

Expand Down
4 changes: 2 additions & 2 deletions lib/runtime-core/src/vm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use std::{
sync::Once,
};

use hashbrown::HashMap;
use std::collections::HashMap;

/// The context of the currently running WebAssembly instance.
///
Expand Down Expand Up @@ -850,8 +850,8 @@ mod vm_ctx_tests {
use crate::cache::Error as CacheError;
use crate::typed_func::Wasm;
use crate::types::{LocalFuncIndex, SigIndex};
use hashbrown::HashMap;
use std::any::Any;
use std::collections::HashMap;
use std::ptr::NonNull;
struct Placeholder;
impl RunnableModule for Placeholder {
Expand Down
Loading