diff --git a/Cargo.lock b/Cargo.lock index 421e7e28..04de4fac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,6 +43,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -61,6 +73,12 @@ dependencies = [ "as-slice", ] +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "amplify" version = "4.6.0" @@ -160,6 +178,12 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "as-slice" version = "0.2.1" @@ -211,6 +235,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -484,6 +514,26 @@ dependencies = [ "cipher", ] +[[package]] +name = "culpa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ae0bfe9317b1cb4ff5a56d766ee4b157b3e1f47f11979253570e88d10fd1fd3" +dependencies = [ + "culpa-macros", +] + +[[package]] +name = "culpa-macros" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "cvt" version = "0.1.2" @@ -589,6 +639,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + [[package]] name = "ec25519" version = "0.1.0" @@ -642,6 +698,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_filter" version = "0.1.2" @@ -700,26 +765,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" -[[package]] -name = "fehler" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5729fe49ba028cd550747b6e62cd3d841beccab5390aa398538c31a2d983635" -dependencies = [ - "fehler-macros", -] - -[[package]] -name = "fehler-macros" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb5acb1045ebbfa222e2c50679e392a71dd77030b78fb0189f2d9c5974400f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ff" version = "0.13.0" @@ -953,17 +998,33 @@ dependencies = [ "subtle", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown", +] [[package]] name = "heck" @@ -1045,16 +1106,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.2.6" @@ -1062,7 +1113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -1167,12 +1218,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e69cdf6b85b5c8dce514f694089a2cf8b1a702f6cd28607bcb3cf296c9778db" -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -1209,6 +1254,19 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "marked-yaml" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59a90dc806da572b03203f1783ab213445cd497a44e147db7b6dc2857d4d9572" +dependencies = [ + "doc-comment", + "hashlink 0.9.1", + "serde", + "serde_path_to_error", + "yaml-rust2", +] + [[package]] name = "matchers" version = "0.1.0" @@ -1656,8 +1714,8 @@ version = "0.3.0" dependencies = [ "anyhow", "clap", + "culpa", "env_logger 0.11.5", - "fehler", "html-page", "log", "radicle", @@ -1666,7 +1724,7 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_yaml 0.9.34+deprecated", + "serde_yaml", "sqlite", "sqlite3-sys", "subplot-build", @@ -1886,13 +1944,15 @@ dependencies = [ [[package]] name = "roadmap" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a129e44a647b309ed394a092e21eabcb58537802c6912920ef4ea76239421234" +checksum = "a84fec6085f0f4c56624c11864696961c96c47924f5c142cdc5fb2d11b2ca3e2" dependencies = [ "anyhow", + "clap", + "marked-yaml", "serde", - "serde_yaml 0.8.26", + "tempfile", "textwrap", "thiserror", ] @@ -2008,7 +2068,7 @@ version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ - "indexmap 2.2.6", + "indexmap", "itoa", "memchr", "ryu", @@ -2016,15 +2076,13 @@ dependencies = [ ] [[package]] -name = "serde_yaml" -version = "0.8.26" +name = "serde_path_to_error" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ - "indexmap 1.9.3", - "ryu", + "itoa", "serde", - "yaml-rust", ] [[package]] @@ -2033,7 +2091,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap", "itoa", "ryu", "serde", @@ -2248,12 +2306,12 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subplot" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c5723f41235a3deefab3cfd6164a5b780802f596fa97eb40dfcf3c39c36b21" +checksum = "46d62441151e292fe7ae178cb9722083ee2b3b3bf1fee42cb4de4b564d73797d" dependencies = [ "anyhow", - "base64 0.21.7", + "base64 0.22.1", "clap", "env_logger 0.10.2", "file_diff", @@ -2269,7 +2327,7 @@ dependencies = [ "serde", "serde-aux", "serde_json", - "serde_yaml 0.9.34+deprecated", + "serde_yaml", "tempfile", "tempfile-fast", "tera", @@ -2280,9 +2338,9 @@ dependencies = [ [[package]] name = "subplot-build" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd58ff7123e83e5a5ed5bcdcd9f6f23226eea5b08bc310e129cad5d24b18fabe" +checksum = "18735c4b777f1cc68d2965faed6d275cecb535b2f193986a94dfc0bd199178aa" dependencies = [ "subplot", "tempfile", @@ -2291,12 +2349,12 @@ dependencies = [ [[package]] name = "subplotlib" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc3c17998cc92ec00493a7d1c0d0256f8977c7baed553777ba347dd6d1c3ccf" +checksum = "acf40312463f3c1e1620bed0ceded88a25f60dfcbe639de2514bf10f6c20bf69" dependencies = [ - "base64 0.21.7", - "fehler", + "base64 0.22.1", + "culpa", "filetime", "fs2", "glob", @@ -2314,11 +2372,11 @@ dependencies = [ [[package]] name = "subplotlib-derive" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0234a041a912954e3cc81230b9f64f6a471c4297e65053e6ad733bb3e473bc60" +checksum = "a9e41839afb9b7d254775225c72a8f645390879ec776c2a608fc6ac26060fbe7" dependencies = [ - "fehler", + "culpa", "proc-macro2", "quote", "syn 2.0.72", @@ -2427,9 +2485,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "smawk", "unicode-linebreak", @@ -3010,12 +3068,34 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink 0.8.4", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 94dcdbbb..80ef83a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "radicle-ci-broker" version = "0.3.0" edition = "2021" -rust-version = "1.74" +rust-version = "1.77" authors = ["Lars Wirzenius "] description = "add integration to CI engins or systems to a Radicle node" license = "MIT OR Apache-2.0" @@ -24,7 +24,7 @@ serde_json = "1.0.108" serde_yaml = "0.9.27" sqlite = "0.32.0" sqlite3-sys = "0.15.0" -subplotlib = "0.9.0" +subplotlib = "0.10.0" thiserror = "1.0.50" time = { version = "0.3.34", features = ["formatting", "macros"] } uuid = { version = "1.7.0", features = ["v4"] } @@ -34,8 +34,8 @@ version = "0.12.0" features = ["default", "test"] [dev-dependencies] -fehler = "1.0.0" +culpa = "1.0.2" tempfile = { version = "3.9.0" } [build-dependencies] -subplot-build = "0.9.0" +subplot-build = "0.10.0" diff --git a/rust-toolchain b/rust-toolchain index bc8a6589..3245dca3 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.74 +1.77