From 3fe06eaa300eea79ab06506e77df4b62b7275ca2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Mar 2025 06:42:37 +0000 Subject: [PATCH 1/2] Update Rust crate clearscreen to v4 --- Cargo.lock | 79 +++++++++++++++++------------------------------------- Cargo.toml | 2 +- 2 files changed, 26 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b10044c1b..4b3ebf069 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -695,15 +695,15 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "clearscreen" -version = "2.0.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f3f22f1a586604e62efd23f78218f3ccdecf7a33c4500db2d37d85a24fe994" +checksum = "8c41dc435a7b98e4608224bbf65282309f5403719df9113621b30f8b6f74e2f4" dependencies = [ - "nix 0.26.4", + "nix", "terminfo", - "thiserror 1.0.69", + "thiserror 2.0.11", "which", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -1031,7 +1031,7 @@ dependencies = [ "atty", "crucible-workspace-hack", "dropshot 0.16.0", - "nix 0.29.0", + "nix", "proptest", "rustls-pemfile 1.0.4", "schemars", @@ -1090,7 +1090,7 @@ dependencies = [ "itertools 0.13.0", "libc", "mime_guess", - "nix 0.29.0", + "nix", "omicron-common", "openapi-lint", "openapiv3", @@ -1613,15 +1613,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - [[package]] name = "dirs-next" version = "2.0.0" @@ -1632,17 +1623,6 @@ dependencies = [ "dirs-sys-next", ] -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -1932,6 +1912,12 @@ dependencies = [ "syn 2.0.99", ] +[[package]] +name = "env_home" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" + [[package]] name = "equivalent" version = "1.0.1" @@ -2443,15 +2429,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c706f1711006204c2ba8fb1a7bd55f689bbf7feca9ff40325206b5e140cff6df" -[[package]] -name = "home" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "hostname" version = "0.3.1" @@ -3386,17 +3363,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.29.0" @@ -6141,11 +6107,10 @@ dependencies = [ [[package]] name = "terminfo" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" +checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662" dependencies = [ - "dirs", "fnv", "nom", "phf", @@ -7149,14 +7114,14 @@ dependencies = [ [[package]] name = "which" -version = "4.4.2" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283" dependencies = [ "either", - "home", - "once_cell", + "env_home", "rustix", + "winsafe", ] [[package]] @@ -7516,6 +7481,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wit-bindgen-rt" version = "0.33.0" diff --git a/Cargo.toml b/Cargo.toml index 7f20798e2..5cc4edda5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ camino = { version = "1.1", features = ["serde1"] } cfg-if = { version = "1" } chrono = { version = "0.4", features = [ "serde" ] } clap = { version = "4.5", features = ["derive", "env", "wrap_help"] } -clearscreen = "2.0.1" +clearscreen = "4.0.1" crossterm = { version = "0.28.1" } crucible-workspace-hack = "0.1.0" # see [patch.crates-io.crucible-workspace-hack] for more csv = "1.3.1" From 80215af87335f888663d42a832ed42856059b31d Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Mon, 17 Mar 2025 14:38:44 -0700 Subject: [PATCH 2/2] Fix hakari --- Cargo.lock | 2 +- workspace-hack/Cargo.toml | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a786e5aa7..8ad00a465 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1312,7 +1312,6 @@ name = "crucible-workspace-hack" version = "0.1.0" dependencies = [ "arrayvec", - "bitflags 1.3.2", "bitflags 2.6.0", "bytes", "cc", @@ -1340,6 +1339,7 @@ dependencies = [ "log", "memchr", "mio", + "nix", "num-integer", "num-iter", "num-traits", diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 0c715f2c1..9adcbcd47 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -16,7 +16,7 @@ publish = false ### BEGIN HAKARI SECTION [dependencies] arrayvec = { version = "0.7", default-features = false, features = ["std"] } -bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2", default-features = false, features = ["serde", "std"] } +bitflags = { version = "2", default-features = false, features = ["serde"] } bytes = { version = "1", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] } clap = { version = "4", features = ["cargo", "derive", "env", "wrap_help"] } @@ -65,7 +65,7 @@ uuid = { version = "1", features = ["serde", "v4"] } zerocopy = { version = "0.7", features = ["derive", "simd"] } [build-dependencies] -bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2", default-features = false, features = ["serde", "std"] } +bitflags = { version = "2", default-features = false, features = ["serde"] } bytes = { version = "1", features = ["serde"] } cc = { version = "1", default-features = false, features = ["parallel"] } chrono = { version = "0.4", features = ["serde"] } @@ -115,13 +115,14 @@ uuid = { version = "1", features = ["serde", "v4"] } zerocopy = { version = "0.7", features = ["derive", "simd"] } [target.x86_64-unknown-linux-gnu.dependencies] -bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1" } +bitflags = { version = "2", default-features = false, features = ["std"] } dof = { version = "0.3", default-features = false, features = ["des"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } +nix = { version = "0.29", features = ["feature", "fs", "term", "uio"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } rustls-pki-types = { version = "1", features = ["std"] } @@ -129,6 +130,7 @@ spin = { version = "0.9", default-features = false, features = ["once", "spin_mu tokio-util = { version = "0.7", features = ["codec", "io"] } [target.x86_64-unknown-linux-gnu.build-dependencies] +bitflags = { version = "2", default-features = false, features = ["std"] } dof = { version = "0.3", default-features = false, features = ["des"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } @@ -142,17 +144,20 @@ spin = { version = "0.9", default-features = false, features = ["once", "spin_mu tokio-util = { version = "0.7", features = ["codec", "io"] } [target.aarch64-apple-darwin.dependencies] +bitflags = { version = "2", default-features = false, features = ["std"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } +nix = { version = "0.29", features = ["feature", "fs", "term", "uio"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } rustls-pki-types = { version = "1", features = ["std"] } tokio-util = { version = "0.7", features = ["codec", "io"] } [target.aarch64-apple-darwin.build-dependencies] +bitflags = { version = "2", default-features = false, features = ["std"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } @@ -164,13 +169,14 @@ rustls-pki-types = { version = "1", features = ["std"] } tokio-util = { version = "0.7", features = ["codec", "io"] } [target.x86_64-unknown-illumos.dependencies] -bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1" } +bitflags = { version = "2", default-features = false, features = ["std"] } dof = { version = "0.3", default-features = false, features = ["des"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } +nix = { version = "0.29", features = ["feature", "fs", "term", "uio"] } once_cell = { version = "1", features = ["unstable"] } rustix = { version = "0.38", features = ["fs", "stdio", "termios"] } rustls-pki-types = { version = "1", features = ["std"] } @@ -179,6 +185,7 @@ tokio-util = { version = "0.7", features = ["codec", "io"] } toml_edit = { version = "0.19", features = ["serde"] } [target.x86_64-unknown-illumos.build-dependencies] +bitflags = { version = "2", default-features = false, features = ["std"] } dof = { version = "0.3", default-features = false, features = ["des"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] }