diff --git a/Cargo.lock b/Cargo.lock index 727c6f6494..55fdde76eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1109,9 +1109,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "endian-type" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" +checksum = "869b0adbda23651a9c5c0c3d270aac9fcb52e8622a8f2b17e57802d7791962f2" [[package]] name = "env_filter" @@ -1182,17 +1182,6 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" -[[package]] -name = "fd-lock" -version = "4.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys 0.59.0", -] - [[package]] name = "find-msvc-tools" version = "0.1.6" @@ -1996,9 +1985,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +checksum = "225e7cfe711e0ba79a68baeddb2982723e4235247aefce1482f2f16c27865b66" dependencies = [ "bitflags 2.10.0", "cfg-if", @@ -2609,9 +2598,9 @@ dependencies = [ [[package]] name = "radix_trie" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +checksum = "3b4431027dcd37fc2a73ef740b5f233aa805897935b8bce0195e41bbf9a3289a" dependencies = [ "endian-type", "nibble_vec", @@ -3050,7 +3039,7 @@ dependencies = [ "malachite-base", "malachite-bigint", "malachite-q", - "nix 0.30.1", + "nix 0.31.1", "num-complex", "num-traits", "once_cell", @@ -3215,7 +3204,7 @@ dependencies = [ "memchr", "memmap2", "mt19937", - "nix 0.30.1", + "nix 0.31.1", "num-complex", "num-integer", "num-traits", @@ -3307,7 +3296,7 @@ dependencies = [ "log", "malachite-bigint", "memchr", - "nix 0.30.1", + "nix 0.31.1", "num-complex", "num-integer", "num-traits", @@ -3388,24 +3377,22 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rustyline" -version = "17.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e902948a25149d50edc1a8e0141aad50f54e22ba83ff988cf8f7c9ef07f50564" +version = "17.0.1" +source = "git+https://github.com/kkawakam/rustyline?rev=7bbd27991a641586a7c8599437ca207b33bcc823#7bbd27991a641586a7c8599437ca207b33bcc823" dependencies = [ "bitflags 2.10.0", "cfg-if", "clipboard-win", - "fd-lock", "home", "libc", "log", "memchr", - "nix 0.30.1", + "nix 0.31.1", "radix_trie", "unicode-segmentation", "unicode-width", "utf8parse", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b4a4800248..48e205a218 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -172,7 +172,7 @@ junction = "1.4.1" libc = "0.2.180" libffi = "5" log = "0.4.29" -nix = { version = "0.30", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] } +nix = { version = "0.31", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] } malachite-bigint = "0.9" malachite-q = "0.9" malachite-base = "0.9" @@ -192,7 +192,9 @@ radium = "1.1.1" rand = "0.9" rand_core = { version = "0.9", features = ["os_rng"] } rustix = { version = "1.1", features = ["event"] } -rustyline = "17.0.1" +# TODO: Replace with published version once rustyline releases with nix 0.31.1 support +# Temporary git dependency to resolve nix version conflict (rustyline v17.0.2 uses nix 0.30.1) +rustyline = { git = "https://github.com/kkawakam/rustyline", rev = "7bbd27991a641586a7c8599437ca207b33bcc823" } serde = { package = "serde_core", version = "1.0.225", default-features = false, features = ["alloc"] } schannel = "0.1.28" scoped-tls = "1"