From c3e6b4bd18ee7866fb97ca27bd3f5b9c2dab4929 Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:13:16 +0000 Subject: [PATCH] Update Rust crate reedline to 0.35.0 --- Cargo.lock | 57 ++++++++++----------------------------- Cargo.toml | 2 +- workspace-hack/Cargo.toml | 10 ++----- 3 files changed, 17 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb12ebe394..86b4798b2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1690,23 +1690,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.6.0", - "crossterm_winapi", - "libc", - "mio 0.8.11", - "parking_lot 0.12.2", - "serde", - "signal-hook", - "signal-hook-mio", - "winapi", -] - [[package]] name = "crossterm" version = "0.28.1" @@ -1716,9 +1699,10 @@ dependencies = [ "bitflags 2.6.0", "crossterm_winapi", "futures-core", - "mio 1.0.2", + "mio", "parking_lot 0.12.2", "rustix", + "serde", "signal-hook", "signal-hook-mio", "winapi", @@ -5201,18 +5185,6 @@ dependencies = [ "adler2", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - [[package]] name = "mio" version = "1.0.2" @@ -6700,7 +6672,7 @@ dependencies = [ "camino-tempfile", "chrono", "clap", - "crossterm 0.28.1", + "crossterm", "crucible-agent-client", "csv", "diesel", @@ -7026,6 +6998,7 @@ dependencies = [ "cookie", "crossbeam-epoch", "crossbeam-utils", + "crossterm", "crypto-common", "curve25519-dalek", "digest", @@ -7067,7 +7040,7 @@ dependencies = [ "log", "managed", "memchr", - "mio 1.0.2", + "mio", "nom", "num-bigint-dig", "num-integer", @@ -7099,7 +7072,6 @@ dependencies = [ "serde_json", "sha1", "sha2", - "signal-hook-mio", "similar", "slog", "smallvec 1.13.2", @@ -7505,7 +7477,7 @@ dependencies = [ "clap", "clickward", "criterion", - "crossterm 0.28.1", + "crossterm", "display-error-chain", "dropshot", "expectorate", @@ -8873,7 +8845,7 @@ dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", - "crossterm 0.28.1", + "crossterm", "instability", "itertools 0.13.0", "lru", @@ -8992,12 +8964,12 @@ dependencies = [ [[package]] name = "reedline" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f8c676a3f3814a23c6a0fc9dff6b6c35b2e04df8134aae6f3929cc34de21a53" +checksum = "c5289de810296f8f2ff58d35544d92ae98d0a631453388bc3e608086be0fa596" dependencies = [ "chrono", - "crossterm 0.27.0", + "crossterm", "fd-lock", "itertools 0.12.1", "nu-ansi-term", @@ -10140,8 +10112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 0.8.11", - "mio 1.0.2", + "mio", "signal-hook", ] @@ -11410,7 +11381,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", "parking_lot 0.12.2", "pin-project-lite", "signal-hook-registry", @@ -12482,7 +12453,7 @@ dependencies = [ "camino", "ciborium", "clap", - "crossterm 0.28.1", + "crossterm", "expectorate", "futures", "hex", @@ -12557,7 +12528,7 @@ dependencies = [ "camino", "ciborium", "clap", - "crossterm 0.28.1", + "crossterm", "omicron-workspace-hack", "reedline", "serde", diff --git a/Cargo.toml b/Cargo.toml index a108b55b38..682ec90793 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -527,7 +527,7 @@ rand_seeder = "0.3.0" ratatui = "0.28.0" rayon = "1.10" rcgen = "0.12.1" -reedline = "0.33.0" +reedline = "0.35.0" ref-cast = "1.0" regex = "1.10.6" regress = "0.9.1" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 37a2ace58f..cc4cf82f20 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -37,6 +37,7 @@ clap_builder = { version = "4.5.20", default-features = false, features = ["carg console = { version = "0.15.8" } crossbeam-epoch = { version = "0.9.18" } crossbeam-utils = { version = "0.8.19" } +crossterm = { version = "0.28.1", features = ["event-stream", "serde"] } crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] } curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibility", "rand_core"] } digest = { version = "0.10.7", features = ["mac", "oid", "std"] } @@ -148,6 +149,7 @@ clap_builder = { version = "4.5.20", default-features = false, features = ["carg console = { version = "0.15.8" } crossbeam-epoch = { version = "0.9.18" } crossbeam-utils = { version = "0.8.19" } +crossterm = { version = "0.28.1", features = ["event-stream", "serde"] } crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] } curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibility", "rand_core"] } digest = { version = "0.10.7", features = ["mac", "oid", "std"] } @@ -250,7 +252,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } [target.x86_64-unknown-linux-gnu.build-dependencies] @@ -263,7 +264,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } [target.x86_64-apple-darwin.dependencies] @@ -274,7 +274,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } [target.x86_64-apple-darwin.build-dependencies] @@ -285,7 +284,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } [target.aarch64-apple-darwin.dependencies] @@ -296,7 +294,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } [target.aarch64-apple-darwin.build-dependencies] @@ -307,7 +304,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } [target.x86_64-unknown-illumos.dependencies] @@ -320,7 +316,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] } @@ -334,7 +329,6 @@ mio = { version = "1.0.2", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } rustix = { version = "0.38.37", features = ["event", "fs", "net", "pipe", "process", "stdio", "system", "termios", "time"] } rustls = { version = "0.23.10", default-features = false, features = ["logging", "ring", "std", "tls12"] } -signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } tokio-rustls = { version = "0.26.0", default-features = false, features = ["logging", "ring", "tls12"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }