diff --git a/Cargo.lock b/Cargo.lock index fd01f093b65..516124c1d9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -241,7 +241,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite", - "tungstenite", + "tungstenite 0.20.1", ] [[package]] @@ -653,8 +653,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686" dependencies = [ "crossterm", - "strum 0.25.0", - "strum_macros 0.25.3", + "strum", + "strum_macros", "unicode-width", ] @@ -697,7 +697,7 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ - "encode_unicode 0.3.6", + "encode_unicode", "lazy_static", "libc", "unicode-width", @@ -977,7 +977,7 @@ dependencies = [ "bitflags 2.4.1", "crossterm_winapi", "libc", - "parking_lot 0.12.1", + "parking_lot", "winapi", ] @@ -1000,27 +1000,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - [[package]] name = "ctor" version = "0.1.26" @@ -1162,7 +1141,7 @@ dependencies = [ "hashbrown 0.14.3", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core", ] [[package]] @@ -1391,7 +1370,7 @@ dependencies = [ "anyhow", "bytesize", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "rand_chacha", "rand_core", "schemars", @@ -1415,7 +1394,7 @@ dependencies = [ "anyhow", "bytesize", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "rand_chacha", "rand_core", "schemars", @@ -1437,7 +1416,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d665cdd8fd34e6faf57815d007ec4d5853f2c79d8cb37b9293225f3555ed239" dependencies = [ "edge-schema 0.0.1", - "http", + "http 0.2.11", "serde", "wasmparser 0.95.0", ] @@ -1466,12 +1445,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - [[package]] name = "encoding_rs" version = "0.8.33" @@ -1606,7 +1579,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "windows-sys 0.52.0", ] @@ -1986,7 +1959,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 2.1.0", "slab", "tokio", @@ -2112,6 +2085,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -2119,7 +2103,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2135,7 +2142,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ - "http", + "http 0.2.11", "serde", ] @@ -2168,8 +2175,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -2181,6 +2188,19 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +dependencies = [ + "bytes", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -2188,8 +2208,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "rustls", "tokio", "tokio-rustls", @@ -2202,7 +2222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.28", "native-tls", "tokio", "tokio-native-tls", @@ -2214,11 +2234,44 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cc7dcb1ab67cd336f468a12491765672e61a3b6b148634dbfe2fe8acd3fe7d9" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", - "tokio-tungstenite", - "tungstenite", + "tokio-tungstenite 0.20.1", + "tungstenite 0.20.1", +] + +[[package]] +name = "hyper-tungstenite" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a343d17fe7885302ed7252767dc7bb83609a874b6ff581142241ec4b73957ad" +dependencies = [ + "http-body-util", + "hyper 1.1.0", + "hyper-util", + "pin-project-lite", + "tokio", + "tokio-tungstenite 0.21.0", + "tungstenite 0.21.0", +] + +[[package]] +name = "hyper-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tracing", ] [[package]] @@ -2323,7 +2376,7 @@ dependencies = [ "libc", "llvm-sys", "once_cell", - "parking_lot 0.12.1", + "parking_lot", ] [[package]] @@ -2538,7 +2591,7 @@ checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ "bitflags 2.4.1", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -2549,7 +2602,7 @@ checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ "bitflags 2.4.1", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -2651,12 +2704,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "matchers" version = "0.1.0" @@ -3097,17 +3144,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -3115,21 +3151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -3140,7 +3162,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -3311,20 +3333,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "csv", - "encode_unicode 1.0.0", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -3503,15 +3511,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -3654,9 +3653,9 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "hyper-tls", "ipnet", @@ -4235,17 +4234,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "serial_test" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d" -dependencies = [ - "lazy_static", - "parking_lot 0.11.2", - "serial_test_derive 0.5.1", -] - [[package]] name = "serial_test" version = "2.0.0" @@ -4256,19 +4244,8 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", - "serial_test_derive 2.0.0", -] - -[[package]] -name = "serial_test_derive" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "parking_lot", + "serial_test_derive", ] [[package]] @@ -4400,18 +4377,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spinoff" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812db6f40551bdcdb10e1d2070ec33f69805d2bfb7e59426c7d14e7e1b4194dd" -dependencies = [ - "colored 2.1.0", - "maplit", - "once_cell", - "strum 0.24.1", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -4430,34 +4395,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros 0.24.3", -] - [[package]] name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - [[package]] name = "strum_macros" version = "0.25.3" @@ -4557,7 +4500,7 @@ checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", + "redox_syscall", "rustix", "windows-sys 0.48.0", ] @@ -4825,7 +4768,19 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls", - "tungstenite", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", ] [[package]] @@ -4950,8 +4905,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "http-range-header", "pin-project-lite", "tower", @@ -5098,7 +5053,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand", @@ -5109,6 +5064,25 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.0.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -5368,8 +5342,8 @@ dependencies = [ "bytes", "derivative", "futures-util", - "hyper", - "hyper-tungstenite", + "hyper 0.14.28", + "hyper-tungstenite 0.11.1", "libc", "mio", "pin-project-lite", @@ -5378,7 +5352,7 @@ dependencies = [ "thiserror", "tokio", "tokio-serde", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tokio-util 0.6.10", "tracing", "virtual-mio 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5396,20 +5370,20 @@ dependencies = [ "bytes", "derivative", "futures-util", - "hyper", - "hyper-tungstenite", + "hyper 0.14.28", + "hyper-tungstenite 0.13.0", "libc", "mio", "pin-project-lite", "rkyv", "serde", - "serial_test 2.0.0", + "serial_test", "socket2 0.4.10", "thiserror", "tokio", "tokio-serde", - "tokio-tungstenite", - "tokio-util 0.6.10", + "tokio-tungstenite 0.20.1", + "tokio-util 0.7.10", "tracing", "tracing-test", "virtual-mio 0.3.0", @@ -5582,7 +5556,7 @@ name = "wasix_http_client" version = "0.4.0" dependencies = [ "anyhow", - "http", + "http 0.2.11", "wai-bindgen-rust", ] @@ -5915,9 +5889,9 @@ dependencies = [ "flate2", "futures", "hex", - "http", + "http 0.2.11", "humantime", - "hyper", + "hyper 0.14.28", "indexmap 1.9.3", "indicatif", "is-terminal", @@ -5929,14 +5903,12 @@ dependencies = [ "pathdiff", "predicates 3.0.4", "pretty_assertions", - "prettytable-rs", "regex", "reqwest", "semver 1.0.20", "serde", "serde_json", "sha2", - "spinoff", "tar", "target-lexicon 0.12.12", "tempfile", @@ -6111,7 +6083,7 @@ dependencies = [ "is-terminal", "log", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "regex", "reqwest", "semver 1.0.20", @@ -6331,7 +6303,7 @@ dependencies = [ "time", "tldextract", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "toml 0.5.11", "tracing", "url", @@ -6437,8 +6409,8 @@ dependencies = [ "getrandom", "heapless", "hex", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "js-sys", "lazy_static", "libc", @@ -6459,7 +6431,7 @@ dependencies = [ "serde_cbor", "serde_derive", "serde_json", - "serde_yaml 0.8.26", + "serde_yaml 0.9.29", "sha2", "shared-buffer", "tempfile", @@ -6589,7 +6561,7 @@ dependencies = [ "glob", "lazy_static", "rustc_version 0.4.0", - "serial_test 0.5.1", + "serial_test", "tempfile", "test-generator", "test-log", @@ -6770,7 +6742,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ca8f334eec3a8197bd25a612c74f415b8691d219ee11f1acd20f15a3e2bf77" dependencies = [ - "http", + "http 0.2.11", "http-serde", "serde", "serde_json", @@ -6783,7 +6755,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a762cf2b0ed389a2a2fb591d63a398c1a4c0f8bef938cfd040285a3c63b695cc" dependencies = [ - "http", + "http 0.2.11", "schemars", "serde", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 3019bed58a7..1ef35ed2332 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,7 +106,7 @@ wasmer = { version = "=4.2.5", path = "lib/api", features = [ anyhow = "1.0" criterion = { version = "0.5", default-features = false } lazy_static = "1.4" -serial_test = "0.5" +serial_test = { version = "2.0", default-features = false } compiler-test-derive = { path = "tests/lib/compiler-test-derive" } tempfile = "3.6.0" # For logging tests using the `RUST_LOG=debug` when testing diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index 5decba23f30..62dde999f65 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -55,7 +55,7 @@ wasmer-types = { version = "=4.2.5", path = "../types", features = [ ] } wasmer-registry = { version = "5.10.1", path = "../registry", features = [ "build-package", - "clap", + "clap", ] } wasmer-object = { version = "=4.2.5", path = "../object", optional = true } virtual-fs = { version = "0.11.0", path = "../virtual-fs", default-features = false, features = [ @@ -72,7 +72,6 @@ wasmer-edge-cli = { version = "=0.1.4", default-features = false } is-terminal = "0.4.7" colored = "2.0" anyhow = "1.0" -spinoff = "0.5.4" # For the function names autosuggestion distance = "0.4" @@ -84,7 +83,6 @@ serde = { version = "1.0.147", features = ["derive"] } dirs = { version = "4.0" } serde_json = { version = "1.0" } target-lexicon = { version = "0.12", features = ["std"] } -prettytable-rs = "0.10.0" wasmer-toml = { workspace = true } indexmap = "1.9.2" walkdir = "2.3.2" diff --git a/lib/virtual-net/Cargo.toml b/lib/virtual-net/Cargo.toml index db23e664d3d..cbcffb9e00e 100644 --- a/lib/virtual-net/Cargo.toml +++ b/lib/virtual-net/Cargo.toml @@ -27,8 +27,8 @@ pin-project-lite = "0.2.9" futures-util = { version = "0.3" } anyhow = "1.0" tokio-serde = { version = "0.8", features = [ "bincode" ], optional = true } -tokio-util = { version = "0.6", features = ["codec"], optional = true } -hyper-tungstenite = { version = "0.11", optional = true } +tokio-util = { version = "0.7.8", features = ["codec"], optional = true } +hyper-tungstenite = { version = "0.13", optional = true } hyper = { version = "0.14", optional = true } tokio-tungstenite = { version = "0.20", optional = true } rkyv = { version = "0.7.40", features = ["indexmap", "validation", "strict"], optional = true } diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml index f623e774bd4..b1507f3184e 100644 --- a/lib/wasix/Cargo.toml +++ b/lib/wasix/Cargo.toml @@ -53,7 +53,7 @@ async-trait = { version = "^0.1" } urlencoding = { version = "^2" } serde_derive = { version = "^1" } serde_json = { version = "^1" } -serde_yaml = { version = "^0.8" } +serde_yaml = { version = "^0.9" } weezl = { version = "^0.1" } hex = { version = "^0.4" } term_size = { version = "0.3" }