From 6c45cbce6e3ae337ce0be6024ec4d9c0c0398635 Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 07:29:47 +0000 Subject: [PATCH] Update Rust crate crossterm to 0.28.1 --- Cargo.lock | 59 +++++++++++++++++++++++++++++---------- Cargo.toml | 2 +- workspace-hack/Cargo.toml | 28 ++++++++++++------- 3 files changed, 64 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b19f148916..190ecc944d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1427,9 +1427,8 @@ checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ "bitflags 2.6.0", "crossterm_winapi", - "futures-core", "libc", - "mio", + "mio 0.8.11", "parking_lot 0.12.2", "serde", "signal-hook", @@ -1437,6 +1436,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "futures-core", + "mio 1.0.1", + "parking_lot 0.12.2", + "rustix", + "signal-hook", + "signal-hook-mio", + "winapi", +] + [[package]] name = "crossterm_winapi" version = "0.9.1" @@ -4433,6 +4449,19 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + [[package]] name = "mockall" version = "0.12.1" @@ -5743,7 +5772,7 @@ dependencies = [ "camino-tempfile", "chrono", "clap", - "crossterm", + "crossterm 0.28.1", "crucible-agent-client", "csv", "diesel", @@ -6057,7 +6086,7 @@ dependencies = [ "const-oid", "crossbeam-epoch", "crossbeam-utils", - "crossterm", + "crossterm 0.27.0", "crypto-common", "der", "diesel", @@ -6095,7 +6124,7 @@ dependencies = [ "log", "managed", "memchr", - "mio", + "mio 0.8.11", "nom", "num-bigint", "num-integer", @@ -6121,6 +6150,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "signal-hook-mio", "similar", "slog", "smallvec 1.13.2", @@ -6515,7 +6545,7 @@ dependencies = [ "chrono", "clap", "clickward", - "crossterm", + "crossterm 0.28.1", "dropshot", "expectorate", "futures", @@ -7756,7 +7786,7 @@ dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", - "crossterm", + "crossterm 0.27.0", "itertools 0.13.0", "lru", "paste", @@ -7887,7 +7917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65ebc241ed0ccea0bbbd775a55a76f0dd9971ef084589dea938751a03ffedc14" dependencies = [ "chrono", - "crossterm", + "crossterm 0.27.0", "fd-lock", "itertools 0.12.1", "nu-ansi-term", @@ -8906,12 +8936,13 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", + "mio 1.0.1", "signal-hook", ] @@ -10050,7 +10081,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio", + "mio 0.8.11", "num_cpus", "parking_lot 0.12.2", "pin-project-lite", @@ -11176,7 +11207,7 @@ dependencies = [ "camino", "ciborium", "clap", - "crossterm", + "crossterm 0.28.1", "expectorate", "futures", "humantime", @@ -11250,7 +11281,7 @@ dependencies = [ "camino", "ciborium", "clap", - "crossterm", + "crossterm 0.28.1", "omicron-workspace-hack", "reedline", "serde", diff --git a/Cargo.toml b/Cargo.toml index d744ec09c34..fa202d006d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -291,7 +291,7 @@ const_format = "0.2.32" cookie = "0.18" criterion = { version = "0.5.1", features = [ "async_tokio" ] } crossbeam = "0.8" -crossterm = { version = "0.27.0", features = ["event-stream"] } +crossterm = { version = "0.28.1", features = ["event-stream"] } crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" } crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" } crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 6c7f0baad55..0bd94e386e9 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -37,7 +37,7 @@ console = { version = "0.15.8" } const-oid = { version = "0.9.6", default-features = false, features = ["db", "std"] } crossbeam-epoch = { version = "0.9.18" } crossbeam-utils = { version = "0.8.19" } -crossterm = { version = "0.27.0", features = ["event-stream", "serde"] } +crossterm = { version = "0.27.0", features = ["serde"] } crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] } der = { version = "0.7.9", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } diesel = { version = "2.1.6", features = ["chrono", "i-implement-a-third-party-backend-and-opt-into-breaking-changes", "network-address", "postgres", "r2d2", "serde_json", "uuid"] } @@ -142,7 +142,7 @@ console = { version = "0.15.8" } const-oid = { version = "0.9.6", default-features = false, features = ["db", "std"] } crossbeam-epoch = { version = "0.9.18" } crossbeam-utils = { version = "0.8.19" } -crossterm = { version = "0.27.0", features = ["event-stream", "serde"] } +crossterm = { version = "0.27.0", features = ["serde"] } crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] } der = { version = "0.7.9", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } diesel = { version = "2.1.6", features = ["chrono", "i-implement-a-third-party-backend-and-opt-into-breaking-changes", "network-address", "postgres", "r2d2", "serde_json", "uuid"] } @@ -234,40 +234,47 @@ dof = { version = "0.3.0", default-features = false, features = ["des"] } linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] } mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } [target.x86_64-unknown-linux-gnu.build-dependencies] dof = { version = "0.3.0", default-features = false, features = ["des"] } linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] } mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } [target.x86_64-apple-darwin.dependencies] mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } [target.x86_64-apple-darwin.build-dependencies] mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } [target.aarch64-apple-darwin.dependencies] mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } [target.aarch64-apple-darwin.build-dependencies] mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } [target.x86_64-unknown-illumos.dependencies] dof = { version = "0.3.0", default-features = false, features = ["des"] } mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] } @@ -275,7 +282,8 @@ toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", featu dof = { version = "0.3.0", default-features = false, features = ["des"] } mio = { version = "0.8.11", features = ["net", "os-ext"] } once_cell = { version = "1.19.0" } -rustix = { version = "0.38.34", features = ["fs", "system", "termios"] } +rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] } +signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] } toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] } toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }