diff --git a/Cargo.lock b/Cargo.lock index 3c32ab216..79bb0fb7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,7 +191,7 @@ dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -226,7 +226,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -248,7 +248,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -259,7 +259,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -475,7 +475,7 @@ dependencies = [ "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", "syn_derive", ] @@ -537,9 +537,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -593,10 +593,10 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.23", + "semver 1.0.24", "serde", "serde_json", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -684,7 +684,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -701,7 +701,7 @@ checksum = "72f3f22f1a586604e62efd23f78218f3ccdecf7a33c4500db2d37d85a24fe994" dependencies = [ "nix 0.26.4", "terminfo", - "thiserror", + "thiserror 1.0.66", "which", "winapi", ] @@ -940,7 +940,7 @@ dependencies = [ "openapiv3", "oximeter", "oximeter-producer", - "progenitor-client", + "progenitor-client 0.9.1", "proptest", "rand 0.8.5", "rand_chacha 0.3.1", @@ -1004,7 +1004,7 @@ dependencies = [ "chrono", "crucible-workspace-hack", "percent-encoding", - "progenitor", + "progenitor 0.9.1", "reqwest", "schemars", "serde", @@ -1045,7 +1045,7 @@ dependencies = [ "slog-term", "tempfile", "test-strategy", - "thiserror", + "thiserror 1.0.66", "tokio", "tokio-rustls 0.24.1", "toml 0.8.19", @@ -1061,7 +1061,7 @@ dependencies = [ "anyhow", "crucible-workspace-hack", "percent-encoding", - "progenitor", + "progenitor 0.9.1", "reqwest", "schemars", "serde", @@ -1255,7 +1255,7 @@ dependencies = [ "chrono", "crucible-workspace-hack", "percent-encoding", - "progenitor", + "progenitor 0.9.1", "reqwest", "schemars", "serde", @@ -1289,7 +1289,7 @@ dependencies = [ "libc", "num-derive", "num-traits", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -1301,7 +1301,7 @@ dependencies = [ "libc", "num-derive", "num-traits", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -1332,7 +1332,7 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "indexmap 2.5.0", + "indexmap 2.7.0", "libc", "log", "memchr", @@ -1352,13 +1352,13 @@ dependencies = [ "rustls-pki-types", "schemars", "scopeguard", - "semver 1.0.23", + "semver 1.0.24", "serde", "serde_json", "slog", "smallvec", "spin 0.9.8", - "syn 2.0.86", + "syn 2.0.96", "time", "time-macros", "tokio", @@ -1509,7 +1509,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -1520,7 +1520,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -1555,7 +1555,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -1564,7 +1564,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" dependencies = [ - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -1585,7 +1585,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -1598,7 +1598,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -1662,7 +1662,7 @@ dependencies = [ "libdlpi-sys", "num_enum 0.5.11", "pretty-hex 0.2.1", - "thiserror", + "thiserror 1.0.66", "tokio", ] @@ -1674,9 +1674,9 @@ dependencies = [ "anyhow", "chrono", "expectorate", - "http 1.1.0", + "http 1.2.0", "omicron-workspace-hack", - "progenitor", + "progenitor 0.8.0", "reqwest", "schemars", "serde", @@ -1693,7 +1693,7 @@ dependencies = [ "pretty-hex 0.4.1", "serde", "serde_json", - "thiserror", + "thiserror 1.0.66", "zerocopy 0.7.32", ] @@ -1714,11 +1714,11 @@ dependencies = [ "form_urlencoded", "futures", "hostname 0.4.0", - "http 1.1.0", + "http 1.2.0", "http-body-util", "hyper", "hyper-util", - "indexmap 2.5.0", + "indexmap 2.7.0", "multer", "openapiv3", "paste", @@ -1757,7 +1757,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -1794,7 +1794,7 @@ dependencies = [ "anyhow", "crucible-workspace-hack", "percent-encoding", - "progenitor", + "progenitor 0.9.1", "reqwest", "schemars", "serde", @@ -1810,7 +1810,7 @@ checksum = "71734e3eb68cd4df338d04dffdcc024f89eb0b238150cc95b826fbfad756452b" dependencies = [ "pest", "pest_derive", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -1861,7 +1861,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -1987,7 +1987,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -2079,7 +2079,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -2121,7 +2121,7 @@ dependencies = [ "chrono", "gateway-messages", "omicron-workspace-hack", - "progenitor", + "progenitor 0.8.0", "rand 0.8.5", "reqwest", "schemars", @@ -2215,8 +2215,8 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.1.0", - "indexmap 2.5.0", + "http 1.2.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -2251,6 +2251,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + [[package]] name = "hashlink" version = "0.9.1" @@ -2323,7 +2329,7 @@ dependencies = [ "ipnet", "once_cell", "rand 0.8.5", - "thiserror", + "thiserror 1.0.66", "tinyvec", "tokio", "tracing", @@ -2346,7 +2352,7 @@ dependencies = [ "rand 0.8.5", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.66", "tokio", "tracing", ] @@ -2401,9 +2407,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -2417,7 +2423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http 1.2.0", ] [[package]] @@ -2428,7 +2434,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body", "pin-project-lite", ] @@ -2462,7 +2468,7 @@ dependencies = [ "crossbeam-channel", "form_urlencoded", "futures", - "http 1.1.0", + "http 1.2.0", "http-body-util", "hyper", "hyper-util", @@ -2518,7 +2524,7 @@ dependencies = [ "futures-channel", "futures-util", "h2", - "http 1.1.0", + "http 1.2.0", "http-body", "httparse", "httpdate", @@ -2536,7 +2542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http 1.1.0", + "http 1.2.0", "hyper", "hyper-util", "rustls 0.23.13", @@ -2554,7 +2560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc4bce64c32578957926e75f832032f81ebb30bcee74f86c5848b13a69e547eb" dependencies = [ "futures-util", - "http 1.1.0", + "http 1.2.0", "http-range", "httpdate", "hyper", @@ -2591,7 +2597,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http 1.2.0", "http-body", "hyper", "pin-project-lite", @@ -2673,7 +2679,7 @@ dependencies = [ "serde", "slog", "smf", - "thiserror", + "thiserror 1.0.66", "tokio", "uuid", "whoami", @@ -2699,12 +2705,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.15.2", "serde", ] @@ -2762,7 +2768,7 @@ dependencies = [ "omicron-workspace-hack", "reqwest", "slog", - "thiserror", + "thiserror 1.0.66", "uuid", ] @@ -2862,7 +2868,7 @@ version = "0.1.0" source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653" dependencies = [ "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -2917,7 +2923,7 @@ dependencies = [ "rand 0.8.5", "rusty-doors", "socket2", - "thiserror", + "thiserror 1.0.66", "tracing", "winnow 0.6.18", ] @@ -3086,7 +3092,7 @@ dependencies = [ "anyhow", "chrono", "percent-encoding", - "progenitor", + "progenitor 0.8.0", "reqwest", "schemars", "serde", @@ -3147,7 +3153,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.1.0", + "http 1.2.0", "httparse", "memchr", "mime", @@ -3225,7 +3231,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "progenitor", + "progenitor 0.8.0", "regress 0.9.1", "reqwest", "schemars", @@ -3250,7 +3256,7 @@ dependencies = [ "serde_json", "sled-hardware-types", "strum", - "thiserror", + "thiserror 1.0.66", "uuid", ] @@ -3273,7 +3279,7 @@ dependencies = [ "dropshot", "futures", "gateway-client", - "http 1.1.0", + "http 1.2.0", "humantime", "ipnetwork", "newtype-uuid", @@ -3295,7 +3301,7 @@ dependencies = [ "slog-error-chain", "steno", "strum", - "thiserror", + "thiserror 1.0.66", "update-engine", "uuid", ] @@ -3423,7 +3429,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -3527,7 +3533,7 @@ dependencies = [ "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -3583,7 +3589,7 @@ dependencies = [ "dropshot", "futures", "hex", - "http 1.1.0", + "http 1.2.0", "ipnetwork", "macaddr", "mg-admin-client", @@ -3592,13 +3598,13 @@ dependencies = [ "once_cell", "oxnet", "parse-display", - "progenitor", - "progenitor-client", + "progenitor 0.8.0", + "progenitor-client 0.8.0", "rand 0.8.5", "regress 0.9.1", "reqwest", "schemars", - "semver 1.0.23", + "semver 1.0.24", "serde", "serde_human_bytes", "serde_json", @@ -3606,7 +3612,7 @@ dependencies = [ "slog", "slog-error-chain", "strum", - "thiserror", + "thiserror 1.0.66", "tokio", "uuid", ] @@ -3622,7 +3628,7 @@ dependencies = [ "schemars", "serde", "serde_with", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -3660,13 +3666,13 @@ dependencies = [ "hex", "reqwest", "ring 0.16.20", - "semver 1.0.23", + "semver 1.0.24", "serde", "serde_derive", "serde_json", "slog", "tar", - "thiserror", + "thiserror 1.0.66", "tokio", "toml 0.7.8", "topological-sort", @@ -3691,7 +3697,7 @@ version = "0.4.0" source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#ef442ee4343e97b6d9c217d3e7533962fe7d7236" dependencies = [ "heck 0.4.1", - "indexmap 2.5.0", + "indexmap 2.7.0", "lazy_static", "openapiv3", "regex", @@ -3703,7 +3709,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.7.0", "serde", "serde_json", ] @@ -3731,7 +3737,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -3760,11 +3766,11 @@ checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ "futures-core", "futures-sink", - "indexmap 2.5.0", + "indexmap 2.7.0", "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.66", "urlencoding", ] @@ -3779,7 +3785,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -3823,7 +3829,7 @@ dependencies = [ "ordered-float 4.2.0", "percent-encoding", "rand 0.8.5", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -3866,7 +3872,7 @@ dependencies = [ "oxide-vpc", "postcard", "serde", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -3928,7 +3934,7 @@ dependencies = [ "oximeter-timeseries-macro", "oximeter-types", "prettyplease", - "syn 2.0.86", + "syn 2.0.96", "toml 0.8.19", "uuid", ] @@ -3941,7 +3947,7 @@ dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -3960,7 +3966,7 @@ dependencies = [ "serde", "slog", "slog-dtrace", - "thiserror", + "thiserror 1.0.66", "tokio", "uuid", ] @@ -3982,7 +3988,7 @@ dependencies = [ "schemars", "serde", "slog-error-chain", - "syn 2.0.86", + "syn 2.0.96", "toml 0.8.19", ] @@ -3996,7 +4002,7 @@ dependencies = [ "oximeter-types", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -4014,7 +4020,7 @@ dependencies = [ "schemars", "serde", "strum", - "thiserror", + "thiserror 1.0.66", "uuid", ] @@ -4103,7 +4109,7 @@ dependencies = [ "regex", "regex-syntax", "structmeta", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -4136,7 +4142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.66", "ucd-trie", ] @@ -4160,7 +4166,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -4181,7 +4187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.7.0", "serde", "serde_derive", ] @@ -4314,7 +4320,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -4362,9 +4368,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -4375,9 +4381,20 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331" dependencies = [ - "progenitor-client", - "progenitor-impl", - "progenitor-macro", + "progenitor-client 0.8.0", + "progenitor-impl 0.8.0", + "progenitor-macro 0.8.0", +] + +[[package]] +name = "progenitor" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88f54bd2506c3e7b6e45b6ab16500abef551689021264f3be260ef7e295ac327" +dependencies = [ + "progenitor-client 0.9.1", + "progenitor-impl 0.9.1", + "progenitor-macro 0.9.1", ] [[package]] @@ -4395,6 +4412,21 @@ dependencies = [ "serde_urlencoded", ] +[[package]] +name = "progenitor-client" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdae8df95f0b2a7d6159a9c43b7380016b8d3b0fc1ece46871ecd2e0087cfaf6" +dependencies = [ + "bytes", + "futures-core", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_urlencoded", +] + [[package]] name = "progenitor-impl" version = "0.8.0" @@ -4402,8 +4434,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" dependencies = [ "heck 0.5.0", - "http 1.1.0", - "indexmap 2.5.0", + "http 1.2.0", + "indexmap 2.7.0", + "openapiv3", + "proc-macro2", + "quote", + "regex", + "schemars", + "serde", + "serde_json", + "syn 2.0.96", + "thiserror 1.0.66", + "typify 0.2.0", + "unicode-ident", +] + +[[package]] +name = "progenitor-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37adc80a94c9cae890e82deeeecc9d8f2a5cb153256caaf1bf0f03611e537214" +dependencies = [ + "heck 0.5.0", + "http 1.2.0", + "indexmap 2.7.0", "openapiv3", "proc-macro2", "quote", @@ -4411,9 +4465,9 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.86", - "thiserror", - "typify", + "syn 2.0.96", + "thiserror 2.0.11", + "typify 0.3.0", "unicode-ident", ] @@ -4425,14 +4479,32 @@ checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b" dependencies = [ "openapiv3", "proc-macro2", - "progenitor-impl", + "progenitor-impl 0.8.0", + "quote", + "schemars", + "serde", + "serde_json", + "serde_tokenstream", + "serde_yaml", + "syn 2.0.96", +] + +[[package]] +name = "progenitor-macro" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3b2b9f0d5ba58375c5e8e89d5dff949108e234c1d9f22a3336d2be4daaf292" +dependencies = [ + "openapiv3", + "proc-macro2", + "progenitor-impl 0.9.1", "quote", "schemars", "serde", "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -4494,7 +4566,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.13", "socket2", - "thiserror", + "thiserror 1.0.66", "tokio", "tracing", ] @@ -4511,7 +4583,7 @@ dependencies = [ "rustc-hash", "rustls 0.23.13", "slab", - "thiserror", + "thiserror 1.0.66", "tinyvec", "tracing", ] @@ -4531,9 +4603,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -4744,7 +4816,7 @@ checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -4762,16 +4834,16 @@ dependencies = [ "strip-ansi-escapes", "strum", "strum_macros 0.26.4", - "thiserror", + "thiserror 1.0.66", "unicode-segmentation", "unicode-width", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4781,9 +4853,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -4792,9 +4864,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "regress" @@ -4834,7 +4906,7 @@ dependencies = [ "crucible-common", "crucible-workspace-hack", "percent-encoding", - "progenitor", + "progenitor 0.9.1", "reqwest", "schemars", "serde", @@ -4855,7 +4927,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 1.1.0", + "http 1.2.0", "http-body", "http-body-util", "hyper", @@ -5024,7 +5096,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.23", + "semver 1.0.24", ] [[package]] @@ -5210,7 +5282,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5236,7 +5308,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5286,18 +5358,18 @@ checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" [[package]] name = "semver" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.214" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -5313,13 +5385,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5330,7 +5402,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5344,9 +5416,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -5372,7 +5444,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5393,7 +5465,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5418,7 +5490,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.7.0", "serde", "serde_derive", "serde_json", @@ -5435,7 +5507,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5444,7 +5516,7 @@ version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.7.0", "itoa", "ryu", "serde", @@ -5632,7 +5704,7 @@ source = "git+https://github.com/oxidecomputer/slog-error-chain?branch=main#15f6 dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5672,7 +5744,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a491bfc47dffa70a3c267bc379e9de9f4b0a7195e474a94498189b177f8d18c" dependencies = [ - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -5750,7 +5822,7 @@ dependencies = [ "serde", "serde_json", "slog", - "thiserror", + "thiserror 1.0.66", "tokio", "uuid", ] @@ -5785,7 +5857,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5796,7 +5868,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5818,7 +5890,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5831,7 +5903,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -5869,9 +5941,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.86" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -5887,7 +5959,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -6008,7 +6080,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -6017,7 +6089,16 @@ version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.66", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -6028,7 +6109,18 @@ checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] @@ -6147,7 +6239,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -6268,7 +6360,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -6281,7 +6373,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.7.0", "toml_datetime", "winnow 0.5.19", ] @@ -6292,7 +6384,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -6330,7 +6422,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -6399,7 +6491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.6.5", + "rand 0.8.5", "static_assertions", ] @@ -6415,8 +6507,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a" dependencies = [ - "typify-impl", - "typify-macro", + "typify-impl 0.2.0", + "typify-macro 0.2.0", +] + +[[package]] +name = "typify" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e03ba3643450cfd95a1aca2e1938fef63c1c1994489337998aff4ad771f21ef8" +dependencies = [ + "typify-impl 0.3.0", + "typify-macro 0.3.0", ] [[package]] @@ -6431,11 +6533,31 @@ dependencies = [ "quote", "regress 0.10.1", "schemars", - "semver 1.0.23", + "semver 1.0.24", "serde", "serde_json", - "syn 2.0.86", - "thiserror", + "syn 2.0.96", + "thiserror 1.0.66", + "unicode-ident", +] + +[[package]] +name = "typify-impl" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bce48219a2f3154aaa2c56cbf027728b24a3c8fe0a47ed6399781de2b3f3eeaf" +dependencies = [ + "heck 0.5.0", + "log", + "proc-macro2", + "quote", + "regress 0.10.1", + "schemars", + "semver 1.0.24", + "serde", + "serde_json", + "syn 2.0.96", + "thiserror 2.0.11", "unicode-ident", ] @@ -6448,12 +6570,29 @@ dependencies = [ "proc-macro2", "quote", "schemars", - "semver 1.0.23", + "semver 1.0.24", "serde", "serde_json", "serde_tokenstream", - "syn 2.0.86", - "typify-impl", + "syn 2.0.96", + "typify-impl 0.2.0", +] + +[[package]] +name = "typify-macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b5780d745920ed73c5b7447496a9b5c42ed2681a9b70859377aec423ecf02b" +dependencies = [ + "proc-macro2", + "quote", + "schemars", + "semver 1.0.24", + "serde", + "serde_json", + "serde_tokenstream", + "syn 2.0.96", + "typify-impl 0.3.0", ] [[package]] @@ -6485,9 +6624,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -6551,7 +6690,7 @@ dependencies = [ "either", "futures", "indent_write", - "indexmap 2.5.0", + "indexmap 2.7.0", "libsw", "linear-map", "omicron-workspace-hack", @@ -6611,7 +6750,7 @@ dependencies = [ "proc-macro2", "quote", "serde_tokenstream", - "syn 2.0.86", + "syn 2.0.96", "usdt-impl", ] @@ -6629,8 +6768,8 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.86", - "thiserror", + "syn 2.0.96", + "thiserror 1.0.66", "thread-id", "version_check", ] @@ -6645,7 +6784,7 @@ dependencies = [ "proc-macro2", "quote", "serde_tokenstream", - "syn 2.0.86", + "syn 2.0.96", "usdt-impl", ] @@ -6796,7 +6935,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -6830,7 +6969,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7289,7 +7428,7 @@ checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -7300,7 +7439,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.96", ] [[package]] @@ -7316,7 +7455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a62a428a79ea2224ce8ab05d6d8a21bdd7b4b68a8dbc1230511677a56e72ef22" dependencies = [ "itertools 0.10.5", - "thiserror", + "thiserror 1.0.66", "tokio", "zone_cfg_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 2096112ff..06169a21a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,6 +71,8 @@ openapiv3 = "2.0.0" opentelemetry = "0.24.0" opentelemetry-jaeger = { version = "0.20.0" } percent-encoding = "2.3" +progenitor = "0.9.1" +progenitor-client = "0.9.1" proptest = "1.5.0" rayon = "1.10.0" rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] } @@ -120,8 +122,6 @@ omicron-uuid-kinds = { git = "https://github.com/oxidecomputer/omicron", branch openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" } oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } -progenitor = "0.8.0" -progenitor-client = "0.8.0" # local path crucible = { path = "./upstairs" } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 5bfbac46f..40ca6d861 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -31,7 +31,7 @@ futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } -hashbrown = { version = "0.14", features = ["raw"] } +hashbrown = { version = "0.14" } hex = { version = "0.4", features = ["serde"] } indexmap = { version = "2", features = ["serde"] } libc = { version = "0.2", features = ["extra_traits"] } @@ -81,7 +81,7 @@ futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } -hashbrown = { version = "0.14", features = ["raw"] } +hashbrown = { version = "0.14" } hex = { version = "0.4", features = ["serde"] } indexmap = { version = "2", features = ["serde"] } libc = { version = "0.2", features = ["extra_traits"] }