diff --git a/Cargo.lock b/Cargo.lock index 7af9008f2e0..e0c680699f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -759,7 +759,7 @@ dependencies = [ "bitflags 2.9.4", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -782,7 +782,7 @@ dependencies = [ "bitflags 2.9.4", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -967,7 +967,7 @@ dependencies = [ "camino-tempfile", "chacha20poly1305", "ciborium", - "derive_more 0.99.20", + "derive_more 2.1.1", "hex", "hkdf", "omicron-common", @@ -1603,7 +1603,7 @@ dependencies = [ "camino-tempfile", "chrono", "daft", - "derive_more 0.99.20", + "derive_more 2.1.1", "expectorate", "itertools 0.14.0", "omicron-common", @@ -1745,7 +1745,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -1881,9 +1881,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "convert_case" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" dependencies = [ "unicode-segmentation", ] @@ -2117,7 +2117,7 @@ checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ "bitflags 2.9.4", "crossterm_winapi", - "derive_more 2.0.1", + "derive_more 2.1.1", "document-features", "futures-core", "mio", @@ -2643,22 +2643,23 @@ dependencies = [ [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ - "convert_case 0.7.1", + "convert_case 0.10.0", "proc-macro2", "quote", + "rustc_version 0.4.1", "syn 2.0.111", ] @@ -7500,7 +7501,7 @@ dependencies = [ "cookie", "daft", "derive-where", - "derive_more 0.99.20", + "derive_more 2.1.1", "dropshot", "ereport-types", "expectorate", @@ -8791,7 +8792,7 @@ dependencies = [ "clickhouse-admin-types", "cockroach-admin-client", "crucible-agent-client", - "derive_more 0.99.20", + "derive_more 2.1.1", "display-error-chain", "dns-server", "dns-service-client", @@ -8990,6 +8991,8 @@ dependencies = [ "daft", "data-encoding", "der", + "derive_more 2.1.1", + "derive_more-impl", "digest", "dof 0.3.0", "dof 0.4.0", @@ -9028,6 +9031,8 @@ dependencies = [ "ipnet", "ipnetwork", "itertools 0.10.5", + "itertools 0.12.1", + "itertools 0.13.0", "lalrpop-util", "lazy_static", "libc", @@ -12989,7 +12994,7 @@ dependencies = [ "camino-tempfile", "chrono", "debug-ignore", - "derive_more 0.99.20", + "derive_more 2.1.1", "dropshot", "either", "expectorate", @@ -13033,7 +13038,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "derive_more 0.99.20", + "derive_more 2.1.1", "dropshot", "futures", "illumos-utils", @@ -13248,7 +13253,7 @@ dependencies = [ "camino-tempfile", "cfg-if", "debug-ignore", - "derive_more 0.99.20", + "derive_more 2.1.1", "expectorate", "futures", "glob", @@ -13489,7 +13494,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.111", @@ -15030,7 +15035,7 @@ dependencies = [ "ciborium", "daft", "debug-ignore", - "derive_more 0.99.20", + "derive_more 2.1.1", "dropshot", "futures", "gfss", @@ -15077,7 +15082,7 @@ dependencies = [ "chacha20poly1305", "ciborium", "daft", - "derive_more 0.99.20", + "derive_more 2.1.1", "dropshot", "gfss", "hex", diff --git a/Cargo.toml b/Cargo.toml index 320e9f9302f..4ab2940434c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -446,7 +446,7 @@ omicron-ddm-admin-client = { path = "clients/ddm-admin-client" } datatest-stable = "0.3.2" db-macros = { path = "nexus/db-macros" } debug-ignore = "1.0.5" -derive_more = "0.99.20" +derive_more = "2.1.1" derive-where = "1.5.0" dev-tools-common = { path = "dev-tools/common" } # Having the i-implement-... feature here makes diesel go away from the workspace-hack diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 7e394233a5c..dd646034b39 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -44,6 +44,7 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibil daft = { version = "0.1.4", features = ["derive", "newtype-uuid1", "oxnet01", "uuid1"] } data-encoding = { version = "2.9.0" } der = { version = "0.7.10", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } +derive_more = { version = "2.1.1", features = ["is_variant"] } digest = { version = "0.10.7", features = ["mac", "oid", "std"] } ecdsa = { version = "0.16.9", features = ["pem", "signing", "std", "verifying"] } ed25519-dalek = { version = "2.1.1", features = ["digest", "pem", "rand_core"] } @@ -76,6 +77,7 @@ indexmap = { version = "2.12.1", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnet = { version = "2.11.0", features = ["serde"] } ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] } +itertools-594e8ee84c453af0 = { package = "itertools", version = "0.13.0" } lalrpop-util = { version = "0.19.12" } lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] } libc = { version = "0.2.174", features = ["extra_traits"] } @@ -184,6 +186,8 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibil daft = { version = "0.1.4", features = ["derive", "newtype-uuid1", "oxnet01", "uuid1"] } data-encoding = { version = "2.9.0" } der = { version = "0.7.10", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] } +derive_more = { version = "2.1.1", features = ["is_variant"] } +derive_more-impl = { version = "2.1.1", features = ["is_variant"] } digest = { version = "0.10.7", features = ["mac", "oid", "std"] } ecdsa = { version = "0.16.9", features = ["pem", "signing", "std", "verifying"] } ed25519-dalek = { version = "2.1.1", features = ["digest", "pem", "rand_core"] } @@ -216,6 +220,7 @@ indexmap = { version = "2.12.1", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnet = { version = "2.11.0", features = ["serde"] } ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] } +itertools-594e8ee84c453af0 = { package = "itertools", version = "0.13.0" } lalrpop-util = { version = "0.19.12" } lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] } libc = { version = "0.2.174", features = ["extra_traits"] } @@ -382,7 +387,8 @@ dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4.0", default-features = getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3.4", default-features = false, features = ["std"] } hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] } hyper-util = { version = "0.1.19", features = ["full"] } -itertools = { version = "0.10.5" } +itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" } +itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" } miniz_oxide = { version = "0.8.5", default-features = false, features = ["with-alloc"] } mio = { version = "1.0.2", features = ["net", "os-ext"] } nom = { version = "7.1.3" } @@ -401,7 +407,8 @@ dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4.0", default-features = getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3.4", default-features = false, features = ["std"] } hyper-rustls = { version = "0.27.7", features = ["http2", "ring", "webpki-tokio"] } hyper-util = { version = "0.1.19", features = ["full"] } -itertools = { version = "0.10.5" } +itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" } +itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" } miniz_oxide = { version = "0.8.5", default-features = false, features = ["with-alloc"] } mio = { version = "1.0.2", features = ["net", "os-ext"] } nom = { version = "7.1.3" }