From 45f8dd7394ad5a09874bead5a0eb08768ea3a800 Mon Sep 17 00:00:00 2001 From: Marek Kaput Date: Wed, 27 Sep 2023 13:57:29 +0200 Subject: [PATCH] Loosen dependency requirements and bump some (#716) This should reduce amount of changes we do when bumping deps, as we used to do this anyway. --- Cargo.lock | 334 ++++++++++++++++++++++++++++++----------------- Cargo.toml | 115 ++++++++-------- scarb/Cargo.toml | 1 - 3 files changed, 271 insertions(+), 179 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 942bf3c75..db9f8c91c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -441,6 +441,12 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" +[[package]] +name = "byteyarn" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7534301c0ea17abb4db06d75efc7b4b0fa360fce8e175a4330d721c71c942ff" + [[package]] name = "cairo-felt" version = "0.8.7" @@ -693,7 +699,7 @@ dependencies = [ "serde", "smol_str", "thiserror", - "toml", + "toml 0.7.8", ] [[package]] @@ -1041,9 +1047,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" +checksum = "fb9ac64500cc83ce4b9f8dafa78186aa008c8dea77a09b94cd307fd0cd5022a8" dependencies = [ "camino", "cargo-platform", @@ -1850,9 +1856,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gix" -version = "0.50.1" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "275b1bfa0d6f6ed31a2e2e878a4539f4994eac8840546283ab3aebbd8fcaa42d" +checksum = "ad6d32e74454459690d57d18ea4ebec1629936e6b130b51d12cb4a81630ac953" dependencies = [ "gix-actor", "gix-archive", @@ -1872,17 +1878,22 @@ dependencies = [ "gix-ignore", "gix-index", "gix-lock", + "gix-macros", "gix-mailmap", "gix-negotiate", "gix-object", "gix-odb", "gix-pack", "gix-path", + "gix-pathspec", "gix-prompt", "gix-ref", "gix-refspec", "gix-revision", + "gix-revwalk", "gix-sec", + "gix-status", + "gix-submodule", "gix-tempfile", "gix-trace", "gix-traverse", @@ -1890,9 +1901,11 @@ dependencies = [ "gix-utils", "gix-validate", "gix-worktree", + "gix-worktree-state", "gix-worktree-stream", - "log", "once_cell", + "parking_lot 0.12.1", + "regex", "signal-hook", "smallvec", "thiserror", @@ -1901,23 +1914,23 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.24.2" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd2566c12095a584716f2c16f051850bd8987f57556f1fef4a7cce0300b83d0" +checksum = "08c60e982c5290897122d4e2622447f014a2dadd5a18cb73d50bb91b31645e27" dependencies = [ "bstr 1.6.2", "btoi", "gix-date", "itoa", - "nom", "thiserror", + "winnow", ] [[package]] name = "gix-archive" -version = "0.2.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc89a798842b519048e947339a9c9f3cfd8fb9c2d9b66b6ebcb0c3cc8fe5874d" +checksum = "ab71635f7fb38ad4cc7da7e98af79e3010e35b05de5cb6eb79b2da68ab93eac7" dependencies = [ "bstr 1.6.2", "gix-date", @@ -1928,16 +1941,16 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a134a674e39e238bd273326a9815296cc71f867ad5466518da71392cff98ce" +checksum = "2451665e70709ba4753b623ef97511ee98c4a73816b2c5b5df25678d607ed820" dependencies = [ "bstr 1.6.2", + "byteyarn", "gix-glob", "gix-path", "gix-quote", - "kstring", - "log", + "gix-trace", "smallvec", "thiserror", "unicode-bom", @@ -1972,9 +1985,9 @@ dependencies = [ [[package]] name = "gix-commitgraph" -version = "0.18.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8219fe6f39588a29dbfb8d1c244b07ee653126edc5b6f3860752c3b5454fa10b" +checksum = "e75a975ee22cf0a002bfe9b5d5cb3d2a88e263a8a178cd7509133cff10f4df8a" dependencies = [ "bstr 1.6.2", "gix-chunk", @@ -1986,9 +1999,9 @@ dependencies = [ [[package]] name = "gix-config" -version = "0.26.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2135b921a699a4c36167148193bea23c653a16ef0686f6a280e383469709a773" +checksum = "c171514b40487d3f677ae37efc0f45ac980e3169f23c27eb30a70b47fdf88ab5" dependencies = [ "bstr 1.6.2", "gix-config-value", @@ -1997,7 +2010,6 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "log", "memchr", "once_cell", "smallvec", @@ -2008,9 +2020,9 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.12.5" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e874f41437441c02991dcea76990b9058fadfc54b02ab4dd06ab2218af43897" +checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" dependencies = [ "bitflags 2.4.0", "bstr 1.6.2", @@ -2021,9 +2033,9 @@ dependencies = [ [[package]] name = "gix-credentials" -version = "0.17.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307d91ec5f7c8e9bfaa217fe30c2e0099101cbe83dbed27a222dbb6def38725f" +checksum = "46900b884cc5af6a6c141ee741607c0c651a4e1d33614b8d888a1ba81cc0bc8a" dependencies = [ "bstr 1.6.2", "gix-command", @@ -2037,9 +2049,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a825babda995d788e30d306a49dacd1e93d5f5d33d53c7682d0347cef40333c" +checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" dependencies = [ "bstr 1.6.2", "itoa", @@ -2049,9 +2061,9 @@ dependencies = [ [[package]] name = "gix-diff" -version = "0.33.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49d7a9a9ed5ec3428c3061da45d0fc5f50b3c07b91ea4e7ec4959668f25f6c" +checksum = "788ddb152c388206e81f36bcbb574e7ed7827c27d8fa62227b34edc333d8928c" dependencies = [ "gix-hash", "gix-object", @@ -2061,9 +2073,9 @@ dependencies = [ [[package]] name = "gix-discover" -version = "0.22.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "041480eb03d8aa0894d9b73d25d182d51bc4d0ea8925a6ee0c971262bbc7715e" +checksum = "69507643d75a0ea9a402fcf73ced517d2b95cc95385904ac09d03e0b952fde33" dependencies = [ "bstr 1.6.2", "dunce", @@ -2076,9 +2088,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.32.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882695cccf38da4c3cc7ee687bdb412cf25e37932d7f8f2c306112ea712449f1" +checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" dependencies = [ "bytes", "bytesize", @@ -2099,9 +2111,9 @@ dependencies = [ [[package]] name = "gix-filter" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4d4d61f2ab07de4612f8e078d7f1a443c7ab5c40f382784c8eacdf0fd172b9" +checksum = "1be40d28cd41445bb6cd52c4d847d915900e5466f7433eaee6a9e0a3d1d88b08" dependencies = [ "bstr 1.6.2", "encoding_rs", @@ -2119,18 +2131,18 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.4.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5b6e9d34a2c61ea4a02bbca94c409ab6dbbca1348cbb67298cd7fed8758761" +checksum = "09815faba62fe9b32d918b75a554686c98e43f7d48c43a80df58eb718e5c6635" dependencies = [ "gix-features", ] [[package]] name = "gix-glob" -version = "0.10.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7255c717f49a556fa5029f6d9f2b3c008b4dd016c87f23c2ab8ca9636d5fade" +checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" dependencies = [ "bitflags 2.4.0", "bstr 1.6.2", @@ -2140,19 +2152,19 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.11.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f" +checksum = "2ccf425543779cddaa4a7c62aba3fa9d90ea135b160be0a72dd93c063121ad4a" dependencies = [ - "hex", + "faster-hex", "thiserror", ] [[package]] name = "gix-hashtable" -version = "0.2.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d" +checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" dependencies = [ "gix-hash", "hashbrown 0.14.0", @@ -2161,9 +2173,9 @@ dependencies = [ [[package]] name = "gix-ignore" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88b95ceb3bc45abcab6eb55ef4e0053e58b4df0712d3f9aec7d0ca990952603" +checksum = "b048f443a1f6b02da4205c34d2e287e3fd45d75e8e2f06cfb216630ea9bff5e3" dependencies = [ "bstr 1.6.2", "gix-glob", @@ -2173,9 +2185,9 @@ dependencies = [ [[package]] name = "gix-index" -version = "0.21.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732f61ec71576bd443a3c24f4716dc7eac180d8929e7bb8603c7310161507106" +checksum = "f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7" dependencies = [ "bitflags 2.4.0", "bstr 1.6.2", @@ -2196,20 +2208,31 @@ dependencies = [ [[package]] name = "gix-lock" -version = "7.0.2" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e82ec23c8a281f91044bf3ed126063b91b59f9c9340bf0ae746f385cc85a6fa" +checksum = "47fc96fa8b6b6d33555021907c81eb3b27635daecf6e630630bdad44f8feaa95" dependencies = [ "gix-tempfile", "gix-utils", "thiserror", ] +[[package]] +name = "gix-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.37", +] + [[package]] name = "gix-mailmap" -version = "0.16.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc0dbbf35d29639770af68d7ff55924d83786c8924b0e6a1766af1a98b7d58b" +checksum = "40f00fa96e29e066ef208f5d13e0f5f95fa70c3ae4bd4f0234272ed4d708a7db" dependencies = [ "bstr 1.6.2", "gix-actor", @@ -2219,9 +2242,9 @@ dependencies = [ [[package]] name = "gix-negotiate" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0061b7ae867e830c77b1ecfc5875f0d042aebb3d7e6014d04fd86ca6c71d59" +checksum = "6f1697bf9911c6d1b8d709b9e6ef718cb5ea5821a1b7991520125a8134448004" dependencies = [ "bitflags 2.4.0", "gix-commitgraph", @@ -2235,9 +2258,9 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.33.2" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdd87520c71a19afecfa616863a4b761621074878f5a3999243b3e37e233943" +checksum = "1e7e19616c67967374137bae83e950e9b518a9ea8a605069bd6716ada357fd6f" dependencies = [ "bstr 1.6.2", "btoi", @@ -2246,18 +2269,17 @@ dependencies = [ "gix-features", "gix-hash", "gix-validate", - "hex", "itoa", - "nom", "smallvec", "thiserror", + "winnow", ] [[package]] name = "gix-odb" -version = "0.50.2" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e827dbda6d3dabadb94cd437d0e0fe8c314a60d136a3235fc6f5bf7b96b976ac" +checksum = "8d6a392c6ba3a2f133cdc63120e9bc7aec81eef763db372c817de31febfe64bf" dependencies = [ "arc-swap", "gix-date", @@ -2274,20 +2296,18 @@ dependencies = [ [[package]] name = "gix-pack" -version = "0.40.2" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f029a4dce9ac91da35c968c3abdcae573b3e52c123be86cbab3011599de533" +checksum = "7536203a45b31e1bc5694bbf90ba8da1b736c77040dd6a520db369f371eb1ab3" dependencies = [ "clru", "gix-chunk", - "gix-diff", "gix-features", "gix-hash", "gix-hashtable", "gix-object", "gix-path", "gix-tempfile", - "gix-traverse", "memmap2", "parking_lot 0.12.1", "smallvec", @@ -2308,9 +2328,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c" +checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" dependencies = [ "bstr 1.6.2", "gix-trace", @@ -2319,11 +2339,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-pathspec" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e26c9b47c51be73f98d38c84494bd5fb99334c5d6fda14ef5d036d50a9e5fd" +dependencies = [ + "bitflags 2.4.0", + "bstr 1.6.2", + "gix-attributes", + "gix-config-value", + "gix-glob", + "gix-path", + "thiserror", +] + [[package]] name = "gix-prompt" -version = "0.5.5" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c22decaf4a063ccae2b2108820c8630c01bd6756656df3fe464b32b8958a5ea" +checksum = "5c9a913769516f5e9d937afac206fb76428e3d7238e538845842887fda584678" dependencies = [ "gix-command", "gix-config-value", @@ -2345,9 +2380,9 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.33.3" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db11edd78bf33043d1969fff51c567a4b30edd77ab44f6f8eb460a4c14985d" +checksum = "22e6b749660b613641769edc1954132eb8071a13c32224891686091bef078de4" dependencies = [ "gix-actor", "gix-date", @@ -2360,15 +2395,15 @@ dependencies = [ "gix-tempfile", "gix-validate", "memmap2", - "nom", "thiserror", + "winnow", ] [[package]] name = "gix-refspec" -version = "0.14.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19a02bf740b326d6c082a7d6f754ebe56eef900986c5e91be7cf000df9ea18d" +checksum = "0895cb7b1e70f3c3bd4550c329e9f5caf2975f97fcd4238e05754e72208ef61e" dependencies = [ "bstr 1.6.2", "gix-hash", @@ -2380,9 +2415,9 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.18.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a13500890435e3b9e7746bceda248646bfc69e259210884c98e29bb7a1aa6f" +checksum = "c8c4b15cf2ab7a35f5bcb3ef146187c8d36df0177e171ca061913cbaaa890e89" dependencies = [ "bstr 1.6.2", "gix-date", @@ -2390,14 +2425,15 @@ dependencies = [ "gix-hashtable", "gix-object", "gix-revwalk", + "gix-trace", "thiserror", ] [[package]] name = "gix-revwalk" -version = "0.4.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d4cbaf3cfbfde2b81b5ee8b469aff42c34693ce0fe17fc3c244d5085307f2c" +checksum = "e9870c6b1032f2084567710c3b2106ac603377f8d25766b8a6b7c33e6e3ca279" dependencies = [ "gix-commitgraph", "gix-date", @@ -2410,9 +2446,9 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7" +checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" dependencies = [ "bitflags 2.4.0", "gix-path", @@ -2420,11 +2456,44 @@ dependencies = [ "windows", ] +[[package]] +name = "gix-status" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "082801c42ba707f2407b5cce3d99b89cfa84f3794962946dc94cfdc00ae522fa" +dependencies = [ + "bstr 1.6.2", + "filetime", + "gix-features", + "gix-fs", + "gix-hash", + "gix-index", + "gix-object", + "gix-path", + "gix-pathspec", + "thiserror", +] + +[[package]] +name = "gix-submodule" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0150e82e9282d3f2ab2dd57a22f9f6c3447b9d9856e5321ac92d38e3e0e2b7" +dependencies = [ + "bstr 1.6.2", + "gix-config", + "gix-path", + "gix-pathspec", + "gix-refspec", + "gix-url", + "thiserror", +] + [[package]] name = "gix-tempfile" -version = "7.0.2" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa28d567848cec8fdd77d36ad4f5f78ecfaba7d78f647d4f63c8ae1a2cec7243" +checksum = "5ae0978f3e11dc57290ee75ac2477c815bca1ce2fa7ed5dc5f16db067410ac4d" dependencies = [ "gix-fs", "libc", @@ -2443,9 +2512,9 @@ checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" [[package]] name = "gix-traverse" -version = "0.30.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12e0fe428394226c37dd686ad64b09a04b569fe157d638b125b4a4c1e7e2df0" +checksum = "22ef04ab3643acba289b5cedd25d6f53c0430770b1d689d1d654511e6fb81ba0" dependencies = [ "gix-commitgraph", "gix-date", @@ -2459,9 +2528,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.21.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4411bdbd1d46b35ae50e84c191660d437f89974e4236627785024be0b577170a" +checksum = "6125ecf46e8c68bf7202da6cad239831daebf0247ffbab30210d72f3856e420f" dependencies = [ "bstr 1.6.2", "gix-features", @@ -2482,9 +2551,9 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.7.7" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040" +checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" dependencies = [ "bstr 1.6.2", "thiserror", @@ -2492,15 +2561,13 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.23.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8bb6dd57dc6c9dfa03cc2cf2cc0942edae405eb6dfd1c34dbd2be00a90cab2" +checksum = "9f5e32972801bd82d56609e6fc84efc358fa1f11f25c5e83b7807ee2280f14fe" dependencies = [ "bstr 1.6.2", - "filetime", "gix-attributes", "gix-features", - "gix-filter", "gix-fs", "gix-glob", "gix-hash", @@ -2508,15 +2575,33 @@ dependencies = [ "gix-index", "gix-object", "gix-path", +] + +[[package]] +name = "gix-worktree-state" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3aeb06960f2c5ac9e4cdb6b38eb3c2b99d5e525e68285fef21ed17dfbd597ad" +dependencies = [ + "bstr 1.6.2", + "gix-features", + "gix-filter", + "gix-fs", + "gix-glob", + "gix-hash", + "gix-index", + "gix-object", + "gix-path", + "gix-worktree", "io-close", "thiserror", ] [[package]] name = "gix-worktree-stream" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb2a0fa070db8f3c0f7e9d5e8f189df7f8fdbb0fed331c79dae4c3410d7106dd" +checksum = "c89fe93a12e45cc3ad6ba429a7dd7506b03d7d406374a65ad9998b5cb2627569" dependencies = [ "gix-attributes", "gix-features", @@ -2876,15 +2961,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "kstring" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" -dependencies = [ - "static_assertions", -] - [[package]] name = "lalrpop" version = "0.20.0" @@ -3534,7 +3610,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -3572,9 +3648,9 @@ dependencies = [ [[package]] name = "prodash" -version = "25.0.2" +version = "26.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d67eb4220992a4a052a4bb03cf776e493ecb1a3a36bab551804153d63486af7" +checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" dependencies = [ "bytesize", "human_format", @@ -3850,7 +3926,6 @@ dependencies = [ "data-encoding", "deno_task_shell", "derive_builder", - "diffy", "directories", "dunce", "fs4", @@ -3886,8 +3961,8 @@ dependencies = [ "test-for-each-example", "thiserror", "tokio", - "toml", - "toml_edit", + "toml 0.8.1", + "toml_edit 0.20.1", "tracing", "tracing-log", "tracing-subscriber", @@ -4002,7 +4077,7 @@ dependencies = [ "serde", "serde_json", "snapbox", - "toml_edit", + "toml_edit 0.20.1", "url", ] @@ -4377,12 +4452,6 @@ dependencies = [ "hex", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "string_cache" version = "0.8.7" @@ -4677,7 +4746,19 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.1", ] [[package]] @@ -4702,6 +4783,19 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -4826,18 +4920,18 @@ dependencies = [ [[package]] name = "typed-builder" -version = "0.15.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe83c85a85875e8c4cb9ce4a890f05b23d38cd0d47647db7895d3d2a79566d2" +checksum = "34085c17941e36627a879208083e25d357243812c30e7d7387c3b954f30ade16" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.15.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a3151c41d0b13e3d011f98adc24434560ef06673a155a6c7f66b9879eecce2" +checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ "proc-macro2", "quote", @@ -5249,7 +5343,7 @@ dependencies = [ "serde", "serde_json", "time", - "toml_edit", + "toml_edit 0.20.1", "walkdir", "xshell", ] diff --git a/Cargo.toml b/Cargo.toml index 6f9d50e23..89e5d1afd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,9 +25,9 @@ readme = "README.md" repository = "https://github.com/software-mansion/scarb" [workspace.dependencies] -anyhow = "1.0.75" -assert_fs = "1.0.13" -async-trait = "0.1.73" +anyhow = "1" +assert_fs = "1" +async-trait = "0.1" cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "00448c02fc474021575217b9b7e871c728552d52" } cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "00448c02fc474021575217b9b7e871c728552d52" } cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "00448c02fc474021575217b9b7e871c728552d52" } @@ -41,62 +41,61 @@ cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = " cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "00448c02fc474021575217b9b7e871c728552d52" } cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "00448c02fc474021575217b9b7e871c728552d52" } cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "00448c02fc474021575217b9b7e871c728552d52", features = ["env_logger"] } -camino = { version = "1.1.6", features = ["serde1"] } -cargo_metadata = "0.17.0" -clap = { version = "4.4.4", features = ["derive", "env", "string"] } -clap-verbosity-flag = "2.0.1" -console = "0.15.7" -data-encoding = "2.4.0" -deno_task_shell = "0.13.1" -derive_builder = "0.12.0" -diffy = "0.3.0" -directories = "5.0.1" -dunce = "1.0.4" -fs4 = "0.6.6" -futures = { version = "0.3.28", default-features = false, features = ["std", "async-await"] } -gix = "0.50.1" -glob = "0.3.1" -ignore = "0.4.20" -include_dir = "0.7.3" -indicatif = "0.17.7" -indoc = "2.0.4" -io_tee = "0.1.1" -itertools = "0.11.0" -libc = "0.2.148" +camino = { version = "1", features = ["serde1"] } +cargo_metadata = "0.18" +clap = { version = "4", features = ["derive", "env", "string"] } +clap-verbosity-flag = "2" +console = "0.15" +data-encoding = "2" +deno_task_shell = "0.13" +derive_builder = "0.12" +directories = "5" +dunce = "1" +fs4 = "0.6" +futures = { version = "0.3", default-features = false, features = ["std", "async-await"] } +gix = "0.54" +glob = "0.3" +ignore = "0.4" +include_dir = "0.7" +indicatif = "0.17" +indoc = "2" +io_tee = "0.1" +itertools = "0.11" +libc = "0.2" log = "0.4" -ntest = "0.9.0" -once_cell = "1.17.2" -pathdiff = { version = "0.2.1", features = ["camino"] } -petgraph = "0.6.4" -predicates = "3.0.4" -semver = { version = "1.0.19", features = ["serde"] } -serde = { version = "1.0.188", features = ["serde_derive"] } -serde-untagged = "0.1.1" -serde-value = "0.7.0" -serde_json = "1.0.107" -serde_test = "1.0.176" -similar-asserts = { version = "1.5.0", features = ["serde"] } -smallvec = "1.11.1" -smol_str = { version = "0.2.0", features = ["serde"] } -snapbox = { version = "0.4.12", features = ["cmd", "path"] } -tempfile = "3.8.0" -test-case = "3.2.1" -thiserror = "1.0.48" -time = "0.3.29" -tokio = { version = "1.32.0", features = ["macros", "io-util", "rt", "rt-multi-thread", "sync"] } -toml = "0.7.8" -toml_edit = { version = "0.19.9", features = ["serde"] } -tracing = "0.1.37" -tracing-log = "0.1.3" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -typed-builder = "0.15.1" -url = { version = "2.4.1", features = ["serde"] } -walkdir = "2.4.0" -which = "4.4.0" -windows-sys = "0.48.0" -xshell = "0.2.5" -xxhash-rust = { version = "0.8.7", features = ["xxh3"] } -zip = { version = "0.6.6", default-features = false, features = ["deflate"] } +ntest = "0.9" +once_cell = "1" +pathdiff = { version = "0.2", features = ["camino"] } +petgraph = "0.6" +predicates = "3" +semver = { version = "1", features = ["serde"] } +serde = { version = "1", features = ["serde_derive"] } +serde-untagged = "0.1" +serde-value = "0.7" +serde_json = "1" +serde_test = "1" +similar-asserts = { version = "1", features = ["serde"] } +smallvec = "1" +smol_str = { version = "0.2", features = ["serde"] } +snapbox = { version = "0.4", features = ["cmd", "path"] } +tempfile = "3" +test-case = "3" +thiserror = "1" +time = "0.3" +tokio = { version = "1", features = ["macros", "io-util", "rt", "rt-multi-thread", "sync"] } +toml = "0.8" +toml_edit = { version = "0.20", features = ["serde"] } +tracing = "0.1" +tracing-log = "0.1" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } +typed-builder = "0.16" +url = { version = "2", features = ["serde"] } +walkdir = "2" +which = "4" +windows-sys = "0.48" +xshell = "0.2" +xxhash-rust = { version = "0.8", features = ["xxh3"] } +zip = { version = "0.6", default-features = false, features = ["deflate"] } [profile.release] lto = true diff --git a/scarb/Cargo.toml b/scarb/Cargo.toml index fb52d1dbf..f96e992b2 100644 --- a/scarb/Cargo.toml +++ b/scarb/Cargo.toml @@ -33,7 +33,6 @@ create-output-dir = { path = "../utils/create-output-dir" } data-encoding.workspace = true deno_task_shell.workspace = true derive_builder.workspace = true -diffy.workspace = true directories.workspace = true dunce.workspace = true fs4.workspace = true