Update some dependencies manually, removing duplicate deps

This commit is contained in:
Mark McCaskey 2020-03-11 11:52:43 -07:00
parent 68376116b8
commit ac3d9a37ae
6 changed files with 135 additions and 69 deletions

190
Cargo.lock generated
View File

@ -111,6 +111,12 @@ dependencies = [
"serde",
]
[[package]]
name = "bumpalo"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
[[package]]
name = "byteorder"
version = "1.3.4"
@ -231,7 +237,7 @@ version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45a9c21f8042b9857bda93f6c1910b9f9f24100187a3d3d52f214a34e3dc5818"
dependencies = [
"cranelift-entity 0.59.0",
"cranelift-entity",
]
[[package]]
@ -244,11 +250,11 @@ dependencies = [
"cranelift-bforest",
"cranelift-codegen-meta",
"cranelift-codegen-shared",
"cranelift-entity 0.59.0",
"cranelift-entity",
"gimli",
"log",
"smallvec 1.2.0",
"target-lexicon 0.10.0",
"target-lexicon",
"thiserror",
]
@ -259,7 +265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "084cd6d5fb0d1da28acd72c199471bfb09acc703ec8f3bf07b1699584272a3b9"
dependencies = [
"cranelift-codegen-shared",
"cranelift-entity 0.59.0",
"cranelift-entity",
]
[[package]]
@ -268,12 +274,6 @@ version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "701b599783305a58c25027a4d73f2d6b599b2d8ef3f26677275f480b4d51e05d"
[[package]]
name = "cranelift-entity"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "722957e05064d97a3157bf0976deed0f3e8ee4f8a4ce167a7c724ca63a4e8bd9"
[[package]]
name = "cranelift-entity"
version = "0.59.0"
@ -288,14 +288,14 @@ checksum = "32daf082da21c0c05d93394ff4842c2ab7c4991b1f3186a1d952f8ac660edd0b"
dependencies = [
"cranelift-codegen",
"raw-cpuid",
"target-lexicon 0.10.0",
"target-lexicon",
]
[[package]]
name = "criterion"
version = "0.2.11"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0363053954f3e679645fc443321ca128b7b950a6fe288cf5f9335cc22ee58394"
checksum = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1"
dependencies = [
"atty",
"cast",
@ -304,13 +304,11 @@ dependencies = [
"csv",
"itertools",
"lazy_static",
"libc",
"num-traits",
"rand_core 0.3.1",
"rand_os",
"rand_xoshiro",
"oorandom",
"plotters",
"rayon",
"rayon-core",
"regex",
"serde",
"serde_derive",
"serde_json",
@ -320,11 +318,10 @@ dependencies = [
[[package]]
name = "criterion-plot"
version = "0.3.1"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76f9212ddf2f4a9eb2d401635190600656a1f88a932ef53d06e7fa4c7e02fb8e"
checksum = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545"
dependencies = [
"byteorder",
"cast",
"itertools",
]
@ -490,9 +487,9 @@ dependencies = [
[[package]]
name = "faerie"
version = "0.13.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f902f2af041f6c7177a2a04f805687cdc71e69c7cbef059a2755d8923f4cd7a8"
checksum = "74b9ed6159e4a6212c61d9c6a86bee01876b192a64accecf58d5b5ae3b667b52"
dependencies = [
"anyhow",
"goblin 0.1.3",
@ -500,7 +497,7 @@ dependencies = [
"log",
"scroll 0.10.1",
"string-interner",
"target-lexicon 0.9.0",
"target-lexicon",
"thiserror",
]
@ -717,6 +714,15 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
[[package]]
name = "js-sys"
version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cb931d43e71f560c81badb0191596562bafad2be06a3f9025b845c847c60df5"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "kernel-net"
version = "0.1.0"
@ -927,6 +933,12 @@ version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c601810575c99596d4afc46f78a678c80105117c379eb3650cf99b8a21ce5b"
[[package]]
name = "oorandom"
version = "11.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
[[package]]
name = "orbclient"
version = "0.3.27"
@ -1010,6 +1022,18 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
[[package]]
name = "plotters"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
dependencies = [
"js-sys",
"num-traits",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "plugin-for-example"
version = "0.1.0"
@ -1229,16 +1253,6 @@ dependencies = [
"rand_core 0.3.1",
]
[[package]]
name = "rand_xoshiro"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03b418169fb9c46533f326efd6eed2576699c44ca92d3052a066214a8d828929"
dependencies = [
"byteorder",
"rand_core 0.3.1",
]
[[package]]
name = "raw-cpuid"
version = "7.0.3"
@ -1596,12 +1610,6 @@ dependencies = [
"syn 1.0.16",
]
[[package]]
name = "target-lexicon"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"
[[package]]
name = "target-lexicon"
version = "0.10.0"
@ -1803,19 +1811,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasm-debug"
version = "0.1.0"
name = "wasm-bindgen"
version = "0.2.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86840eccceaf682e29be7810dcae5785b9c3b0349ce44d3eaecd9e50f893aee0"
checksum = "3557c397ab5a8e347d434782bcd31fc1483d927a6826804cec05cc792ee2519d"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0da9c9a19850d3af6df1cb9574970b566d617ecfaf36eb0b706b6f3ef9bd2f8"
dependencies = [
"bumpalo",
"lazy_static",
"log",
"proc-macro2 1.0.9",
"quote 1.0.2",
"syn 1.0.16",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f6fde1d36e75a714b5fe0cffbb78978f222ea6baebb726af13c78869fdb4205"
dependencies = [
"quote 1.0.2",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25bda4168030a6412ea8a047e27238cadf56f0e53516e1e83fec0a8b7c786f6d"
dependencies = [
"proc-macro2 1.0.9",
"quote 1.0.2",
"syn 1.0.16",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc9f36ad51f25b0219a3d4d13b90eb44cd075dff8b6280cca015775d7acaddd8"
[[package]]
name = "wasm-debug"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0de430168172db11a702b873514492de62c30cdfbf4e46cc8ad4a54c3b8a7506"
dependencies = [
"anyhow",
"cranelift-entity 0.52.0",
"cranelift-entity",
"faerie",
"gimli",
"more-asserts",
"target-lexicon 0.9.0",
"target-lexicon",
"thiserror",
"wasmparser 0.39.3",
"wasmparser",
]
[[package]]
@ -1855,7 +1917,7 @@ version = "0.16.0"
dependencies = [
"byteorder",
"cranelift-codegen",
"cranelift-entity 0.59.0",
"cranelift-entity",
"cranelift-native",
"libc",
"nix",
@ -1864,13 +1926,13 @@ dependencies = [
"serde-bench",
"serde_bytes",
"serde_derive",
"target-lexicon 0.10.0",
"target-lexicon",
"wasm-debug",
"wasmer-clif-fork-frontend",
"wasmer-clif-fork-wasm",
"wasmer-runtime-core",
"wasmer-win-exception-handler",
"wasmparser 0.51.4",
"wasmparser",
"winapi",
]
@ -1883,7 +1945,7 @@ dependencies = [
"cranelift-codegen",
"log",
"smallvec 1.2.0",
"target-lexicon 0.10.0",
"target-lexicon",
]
[[package]]
@ -1893,11 +1955,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a35e21d3aebc51cc6ebc0e830cf8458a9891c3482fb3c65ad18d408102929ae5"
dependencies = [
"cranelift-codegen",
"cranelift-entity 0.59.0",
"cranelift-entity",
"log",
"thiserror",
"wasmer-clif-fork-frontend",
"wasmparser 0.51.4",
"wasmparser",
]
[[package]]
@ -1967,7 +2029,7 @@ dependencies = [
"smallvec 0.6.13",
"wabt",
"wasmer-runtime-core",
"wasmparser 0.51.4",
"wasmparser",
"winapi",
]
@ -2051,10 +2113,10 @@ dependencies = [
"serde-bench",
"serde_bytes",
"serde_derive",
"smallvec 0.6.13",
"target-lexicon 0.9.0",
"smallvec 1.2.0",
"target-lexicon",
"wasm-debug",
"wasmparser 0.51.4",
"wasmparser",
"winapi",
]
@ -2151,12 +2213,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "wasmparser"
version = "0.39.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470"
[[package]]
name = "wasmparser"
version = "0.51.4"
@ -2172,6 +2228,16 @@ dependencies = [
"leb128",
]
[[package]]
name = "web-sys"
version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "721c6263e2c66fd44501cc5efbfa2b7dfa775d13e4ea38c46299646ed1f9c70a"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "winapi"
version = "0.3.8"

View File

@ -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]

View File

@ -21,7 +21,7 @@ singlepass = ["wasmer-singlepass-backend"]
[dev-dependencies]
wabt = "0.9.1"
criterion = "0.2"
criterion = "0.3"
[[bench]]
name = "metering_benchmark"

View File

@ -18,10 +18,10 @@ lazy_static = "1.4"
errno = "0.2"
libc = "0.2.60"
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"

View File

@ -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)?;
}

View File

@ -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]