From 66091164869879e37c7b6c85be0496b4a8710650 Mon Sep 17 00:00:00 2001 From: 35V LG84 <35vlg84-x4e6b92@e257.fi> Date: Sun, 22 Dec 2024 17:43:41 +0200 Subject: [PATCH] Update deps (Gix 0.69.0, et al.) Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi> --- CHANGELOG.adoc | 7 +- Cargo.lock | 238 ++++++++++++++++++++++++++++------------ Cargo.toml | 2 +- tackler-core/Cargo.toml | 2 +- 4 files changed, 172 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 41155e7..f68c30b 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -40,15 +40,18 @@ Fixes in this release: * Git Backend: When opening the repo, use exact location, and don't search upwards on the directory tree - +* Implement Tackler-Mk1 and JDK compatible full haystack regex matcher. + This change is affecting Account Selectors which use regex. ==== Development Updated dependencies and tools: * Dependencies +** gix: 0.69.0 ** serde: 1.0.216 - +** serde_json: 1.0.134 +** serde_regex: removed ===== Rust toolchain diff --git a/Cargo.lock b/Cargo.lock index 3494bfd..4d2ceae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -210,7 +210,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -316,7 +316,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -408,7 +408,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -520,9 +520,9 @@ dependencies = [ [[package]] name = "gix" -version = "0.68.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04c66359b5e17f92395abc433861df0edf48f39f3f590818d1d7217327dd6a1" +checksum = "46db6f5931c1607c9f71b950d0abfe067113526ceaf7d10b2285c07d5b2cef29" dependencies = [ "gix-actor", "gix-commitgraph", @@ -541,11 +541,13 @@ dependencies = [ "gix-odb", "gix-pack", "gix-path", + "gix-protocol", "gix-ref", "gix-refspec", "gix-revision", "gix-revwalk", "gix-sec", + "gix-shallow", "gix-tempfile", "gix-trace", "gix-traverse", @@ -554,7 +556,7 @@ dependencies = [ "gix-validate", "once_cell", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -567,7 +569,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror 2.0.8", + "thiserror 2.0.9", "winnow", ] @@ -577,7 +579,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48b897b4bbc881aea994b4a5bbb340a04979d7be9089791304e04a9fbc66b53" dependencies = [ - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -586,7 +588,19 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6ffbeb3a5c0b8b84c3fe4133a6f8c82fa962f4caefe8d0762eced025d3eb4f7" dependencies = [ - "thiserror 2.0.8", + "thiserror 2.0.9", +] + +[[package]] +name = "gix-command" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9405c0a56e17f8365a46870cd2c7db71323ecc8bda04b50cb746ea37bd091e90" +dependencies = [ + "bstr", + "gix-path", + "gix-trace", + "shell-words", ] [[package]] @@ -600,7 +614,7 @@ dependencies = [ "gix-features", "gix-hash", "memmap2", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -619,7 +633,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", "unicode-bom", "winnow", ] @@ -634,31 +648,31 @@ dependencies = [ "bstr", "gix-path", "libc", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] name = "gix-date" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691142b1a34d18e8ed6e6114bc1a2736516c5ad60ef3aa9bd1b694886e3ca92d" +checksum = "c57c477b645ee248b173bb1176b52dd528872f12c50375801a58aaf5ae91113f" dependencies = [ "bstr", "itoa", "jiff", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] name = "gix-diff" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a327be31a392144b60ab0b1c863362c32a1c8f7effdfa2141d5d5b6b916ef3bf" +checksum = "a8e92566eccbca205a0a0f96ffb0327c061e85bc5c95abbcddfe177498aa04f6" dependencies = [ "bstr", "gix-hash", "gix-object", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -674,7 +688,7 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -694,15 +708,15 @@ dependencies = [ "parking_lot 0.12.3", "prodash", "sha1_smol", - "thiserror 2.0.8", + "thiserror 2.0.9", "walkdir", ] [[package]] name = "gix-fs" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34740384d8d763975858fa2c176b68652a6fcc09f616e24e3ce967b0d370e4d8" +checksum = "3b3d4fac505a621f97e5ce2c69fdc425742af00c0920363ca4074f0eb48b1db9" dependencies = [ "fastrand", "gix-features", @@ -728,7 +742,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b5eccc17194ed0e67d49285e4853307e4147e95407f91c1c3e4a13ba9f4e4ce" dependencies = [ "faster-hex", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -767,7 +781,7 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -778,14 +792,14 @@ checksum = "1cd3ab68a452db63d9f3ebdacb10f30dba1fa0d31ac64f4203d395ed1102d940" dependencies = [ "gix-tempfile", "gix-utils", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] name = "gix-object" -version = "0.46.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d93e2bbfa83a307e47f45e45de7b6c04d7375a8bd5907b215f4bf45237d879" +checksum = "e42d58010183ef033f31088479b4eb92b44fe341b35b62d39eb8b185573d77ea" dependencies = [ "bstr", "gix-actor", @@ -793,19 +807,20 @@ dependencies = [ "gix-features", "gix-hash", "gix-hashtable", + "gix-path", "gix-utils", "gix-validate", "itoa", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", "winnow", ] [[package]] name = "gix-odb" -version = "0.65.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bed6e1b577c25a6bb8e6ecbf4df525f29a671ddf5f2221821a56a8dbeec4e3" +checksum = "cb780eceb3372ee204469478de02eaa34f6ba98247df0186337e0333de97d0ae" dependencies = [ "arc-swap", "gix-date", @@ -819,14 +834,14 @@ dependencies = [ "gix-quote", "parking_lot 0.12.3", "tempfile", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] name = "gix-pack" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b91fec04d359544fecbb8e85117ec746fbaa9046ebafcefb58cb74f20dc76d4" +checksum = "4158928929be29cae7ab97afc8e820a932071a7f39d8ba388eed2380c12c566c" dependencies = [ "clru", "gix-chunk", @@ -837,10 +852,22 @@ dependencies = [ "gix-path", "memmap2", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", "uluru", ] +[[package]] +name = "gix-packetline" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "911aeea8b2dabeed2f775af9906152a1f0109787074daf9e64224e3892dde453" +dependencies = [ + "bstr", + "faster-hex", + "gix-trace", + "thiserror 2.0.9", +] + [[package]] name = "gix-path" version = "0.10.13" @@ -851,7 +878,26 @@ dependencies = [ "gix-trace", "home", "once_cell", - "thiserror 2.0.8", + "thiserror 2.0.9", +] + +[[package]] +name = "gix-protocol" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84642e8b6fed7035ce9cc449593019c55b0ec1af7a5dce1ab8a0636eaaeb067" +dependencies = [ + "bstr", + "gix-date", + "gix-features", + "gix-hash", + "gix-ref", + "gix-shallow", + "gix-transport", + "gix-utils", + "maybe-async", + "thiserror 2.0.9", + "winnow", ] [[package]] @@ -862,14 +908,14 @@ checksum = "64a1e282216ec2ab2816cd57e6ed88f8009e634aec47562883c05ac8a7009a63" dependencies = [ "bstr", "gix-utils", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] name = "gix-ref" -version = "0.49.0" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eae462723686272a58f49501015ef7c0d67c3e042c20049d8dd9c7eff92efde" +checksum = "a91b61776c839d0f1b7114901179afb0947aa7f4d30793ca1c56d335dfef485f" dependencies = [ "gix-actor", "gix-features", @@ -882,7 +928,7 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror 2.0.8", + "thiserror 2.0.9", "winnow", ] @@ -897,14 +943,14 @@ dependencies = [ "gix-revision", "gix-validate", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] name = "gix-revision" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44488e0380847967bc3e3cacd8b22652e02ea1eb58afb60edd91847695cd2d8d" +checksum = "61e1ddc474405a68d2ce8485705dd72fe6ce959f2f5fe718601ead5da2c8f9e7" dependencies = [ "bitflags 2.6.0", "bstr", @@ -915,7 +961,7 @@ dependencies = [ "gix-object", "gix-revwalk", "gix-trace", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -930,7 +976,7 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -945,6 +991,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "gix-shallow" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2673242e87492cb6ff671f0c01f689061ca306c4020f137197f3abc84ce01" +dependencies = [ + "bstr", + "gix-hash", + "gix-lock", + "thiserror 2.0.9", +] + [[package]] name = "gix-tempfile" version = "15.0.0" @@ -964,11 +1022,27 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04bdde120c29f1fc23a24d3e115aeeea3d60d8e65bab92cc5f9d90d9302eb952" +[[package]] +name = "gix-transport" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d91e507a8713cfa2318d5a85d75b36e53a40379cc7eb7634ce400ecacbaf" +dependencies = [ + "bstr", + "gix-command", + "gix-features", + "gix-packetline", + "gix-quote", + "gix-sec", + "gix-url", + "thiserror 2.0.9", +] + [[package]] name = "gix-traverse" -version = "0.43.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff2ec9f779680f795363db1c563168b32b8d6728ec58564c628e85c92d29faf" +checksum = "6ed47d648619e23e93f971d2bba0d10c1100e54ef95d2981d609907a8cabac89" dependencies = [ "bitflags 2.6.0", "gix-commitgraph", @@ -978,19 +1052,20 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] name = "gix-url" -version = "0.28.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09f97db3618fb8e473d7d97e77296b50aaee0ddcd6a867f07443e3e87391099" +checksum = "d096fb733ba6bd3f5403dba8bd72bdd8809fe2b347b57844040b8f49c93492d9" dependencies = [ "bstr", "gix-features", "gix-path", - "thiserror 2.0.8", + "percent-encoding", + "thiserror 2.0.9", "url", ] @@ -1011,7 +1086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd520d09f9f585b34b32aba1d0b36ada89ab7fefb54a8ca3fe37fc482a750937" dependencies = [ "bstr", - "thiserror 2.0.8", + "thiserror 2.0.9", ] [[package]] @@ -1169,7 +1244,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -1334,6 +1409,17 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "maybe-async" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.91", +] + [[package]] name = "memchr" version = "2.7.4" @@ -1777,14 +1863,14 @@ checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -1828,6 +1914,12 @@ dependencies = [ "keccak", ] +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + [[package]] name = "shlex" version = "1.3.0" @@ -1877,9 +1969,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" dependencies = [ "proc-macro2", "quote", @@ -1894,7 +1986,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -1994,11 +2086,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.8" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 2.0.8", + "thiserror-impl 2.0.9", ] [[package]] @@ -2009,18 +2101,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] name = "thiserror-impl" -version = "2.0.8" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -2103,9 +2195,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -2279,7 +2371,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", "wasm-bindgen-shared", ] @@ -2301,7 +2393,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2481,7 +2573,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", "synstructure", ] @@ -2503,7 +2595,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] [[package]] @@ -2523,7 +2615,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", "synstructure", ] @@ -2546,5 +2638,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.90", + "syn 2.0.91", ] diff --git a/Cargo.toml b/Cargo.toml index 26961be..20ca59a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,6 +47,6 @@ uuid = { version = "1.11.0", default-features = false, features = [ "serde" ] } log = "0.4.22" regex = { version = "1.11.1" } serde = { version = "1.0.216", default-features = false } -serde_json = { version = "1.0.133" , default-features = false, features = [ "std", "arbitrary_precision" ] } +serde_json = { version = "1.0.134" , default-features = false, features = [ "std", "arbitrary_precision" ] } itertools = "0.13.0" tikv-jemallocator = "0.6.0" diff --git a/tackler-core/Cargo.toml b/tackler-core/Cargo.toml index e06bc17..532f750 100644 --- a/tackler-core/Cargo.toml +++ b/tackler-core/Cargo.toml @@ -47,7 +47,7 @@ sha2 = "0.10.8" sha3 = "0.10.8" digest = "0.10.7" -gix = { version = "0.68.0", default-features = false, features = ["max-performance-safe", "revision"] } +gix = { version = "0.69.0", default-features = false, features = ["max-performance-safe", "revision"] } toml = "0.8.19" [target.'cfg(not(target_env = "msvc"))'.dependencies]