diff --git a/Cargo.lock b/Cargo.lock index 4b965fcde..e4d02c56c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -724,10 +724,11 @@ checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" [[package]] name = "fd-lock" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06" +checksum = "b8806dd91a06a7a403a8e596f9bfbfb34e469efbc363fc9c9713e79e26472e36" dependencies = [ + "cfg-if 1.0.0", "libc", "winapi", ] @@ -1028,9 +1029,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.99" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" [[package]] name = "libffi" @@ -1182,19 +1183,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "nix" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e5e343312e7fbeb2a52139114e9e702991ef9c2aea6817ff2440b35647d56" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.22.1" @@ -1923,7 +1911,7 @@ dependencies = [ "md-5", "memchr", "mt19937", - "nix 0.22.1", + "nix", "num-bigint", "num-complex", "num-integer", @@ -2009,9 +1997,9 @@ checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" [[package]] name = "rustyline" -version = "8.2.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd4eaf7a7738f76c98e4f0395253ae853be3eb018f7b0bb57fe1b6c17e31874" +checksum = "790487c3881a63489ae77126f57048b42d62d3b2bafbf37453ea19eedb6340d6" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -2021,7 +2009,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.20.1", + "nix", "radix_trie", "scopeguard", "smallvec", diff --git a/Cargo.toml b/Cargo.toml index 777d35fbb..d9e875cfb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ flame = { version = "0.2", optional = true } flamescope = { version = "0.1", optional = true } [target.'cfg(not(target_os = "wasi"))'.dependencies] -rustyline = "8.1" +rustyline = "9" [dev-dependencies] cpython = "0.6" @@ -72,7 +72,4 @@ opt-level = 3 [patch.crates-io] # REDOX START, Uncommment when you want to compile/check with redoxer -# rustyline = { git = "https://github.com/kkawakam/rustyline" } -# # nix = { git = "https://github.com/nix-rust/nix" } -# nix = { git = "https://github.com/coolreader18/nix", branch = "upd-libc" } # REDOX END diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 8401f2726..fa0bf4de7 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -66,7 +66,7 @@ ahash = "0.7.2" crc = "^1.0.0" bitflags = "1.2.1" libc = "0.2.99" -nix = "0.22" +nix = "0.22.1" csv-core = "0.1" paste = "1.0.5" base64 = "0.13" @@ -124,7 +124,7 @@ strum_macros = "0.21" gethostname = "0.2.0" socket2 = { version = "0.4.0", features = ["all"] } dns-lookup = "1.0" -rustyline = "8.1" +rustyline = "9" openssl = { version = "0.10.32", optional = true } openssl-sys = { version = "0.9", optional = true } openssl-probe = { version = "0.1", optional = true }