Skip to content

Commit 8398771

Browse files
tautschnigtautschnig
authored
Update cargo dependencies (#3776)
This includes updates beyond patch version level to `cargo_metadata` and `tree-sitter` (and `tree-sitter-rust`), which required code changes. (Updating `which` did not entail code changes.) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent 4c1af16 commit 8398771

File tree

9 files changed

+111
-68
lines changed

9 files changed

+111
-68
lines changed

‎Cargo.lock

Lines changed: 81 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ dependencies = [
160160

161161
[[package]]
162162
name = "bstr"
163-
version = "1.11.0"
163+
version = "1.11.1"
164164
source = "registry+https://github.com/rust-lang/crates.io-index"
165-
checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
165+
checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8"
166166
dependencies = [
167167
"memchr",
168168
"regex-automata 0.4.9",
@@ -176,7 +176,7 @@ dependencies = [
176176
"anyhow",
177177
"cargo_metadata",
178178
"clap",
179-
"which",
179+
"which 7.0.0",
180180
]
181181

182182
[[package]]
@@ -211,23 +211,23 @@ dependencies = [
211211

212212
[[package]]
213213
name = "cargo_metadata"
214-
version = "0.18.1"
214+
version = "0.19.1"
215215
source = "registry+https://github.com/rust-lang/crates.io-index"
216-
checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
216+
checksum = "8769706aad5d996120af43197bf46ef6ad0fda35216b4505f926a365a232d924"
217217
dependencies = [
218218
"camino",
219219
"cargo-platform",
220220
"semver",
221221
"serde",
222222
"serde_json",
223-
"thiserror",
223+
"thiserror 2.0.6",
224224
]
225225

226226
[[package]]
227227
name = "cc"
228-
version = "1.2.3"
228+
version = "1.2.4"
229229
source = "registry+https://github.com/rust-lang/crates.io-index"
230-
checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
230+
checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
231231
dependencies = [
232232
"shlex",
233233
]
@@ -273,7 +273,7 @@ dependencies = [
273273
"tracing",
274274
"tracing-subscriber",
275275
"tracing-tree 0.4.0 (git+https://github.com/Nadrieril/tracing-tree)",
276-
"which",
276+
"which 6.0.3",
277277
]
278278

279279
[[package]]
@@ -587,6 +587,12 @@ version = "0.4.2"
587587
source = "registry+https://github.com/rust-lang/crates.io-index"
588588
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
589589

590+
[[package]]
591+
name = "foldhash"
592+
version = "0.1.3"
593+
source = "registry+https://github.com/rust-lang/crates.io-index"
594+
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
595+
590596
[[package]]
591597
name = "getopts"
592598
version = "0.2.21"
@@ -627,7 +633,7 @@ checksum = "3a6ad932c6dd3cfaf16b66754a42f87bbeefd591530c4b6a8334270a7df3e853"
627633
dependencies = [
628634
"ahash",
629635
"petgraph",
630-
"thiserror",
636+
"thiserror 1.0.69",
631637
]
632638

633639
[[package]]
@@ -644,6 +650,9 @@ name = "hashbrown"
644650
version = "0.15.2"
645651
source = "registry+https://github.com/rust-lang/crates.io-index"
646652
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
653+
dependencies = [
654+
"foldhash",
655+
]
647656

648657
[[package]]
649658
name = "hashlink"
@@ -819,7 +828,7 @@ dependencies = [
819828
"toml",
820829
"tracing",
821830
"tracing-subscriber",
822-
"which",
831+
"which 7.0.0",
823832
]
824833

825834
[[package]]
@@ -867,9 +876,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
867876

868877
[[package]]
869878
name = "libc"
870-
version = "0.2.167"
879+
version = "0.2.168"
871880
source = "registry+https://github.com/rust-lang/crates.io-index"
872-
checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
881+
checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
873882

874883
[[package]]
875884
name = "linear-map"
@@ -1319,9 +1328,9 @@ dependencies = [
13191328

13201329
[[package]]
13211330
name = "redox_syscall"
1322-
version = "0.5.7"
1331+
version = "0.5.8"
13231332
source = "registry+https://github.com/rust-lang/crates.io-index"
1324-
checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
1333+
checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
13251334
dependencies = [
13261335
"bitflags",
13271336
]
@@ -1449,18 +1458,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
14491458

14501459
[[package]]
14511460
name = "semver"
1452-
version = "1.0.23"
1461+
version = "1.0.24"
14531462
source = "registry+https://github.com/rust-lang/crates.io-index"
1454-
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
1463+
checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
14551464
dependencies = [
14561465
"serde",
14571466
]
14581467

14591468
[[package]]
14601469
name = "serde"
1461-
version = "1.0.215"
1470+
version = "1.0.216"
14621471
source = "registry+https://github.com/rust-lang/crates.io-index"
1463-
checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
1472+
checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
14641473
dependencies = [
14651474
"serde_derive",
14661475
]
@@ -1476,9 +1485,9 @@ dependencies = [
14761485

14771486
[[package]]
14781487
name = "serde_derive"
1479-
version = "1.0.215"
1488+
version = "1.0.216"
14801489
source = "registry+https://github.com/rust-lang/crates.io-index"
1481-
checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
1490+
checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
14821491
dependencies = [
14831492
"proc-macro2",
14841493
"quote",
@@ -1595,14 +1604,19 @@ dependencies = [
15951604
"kani",
15961605
]
15971606

1607+
[[package]]
1608+
name = "streaming-iterator"
1609+
version = "0.1.9"
1610+
source = "registry+https://github.com/rust-lang/crates.io-index"
1611+
checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
1612+
15981613
[[package]]
15991614
name = "string-interner"
1600-
version = "0.17.0"
1615+
version = "0.18.0"
16011616
source = "registry+https://github.com/rust-lang/crates.io-index"
1602-
checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e"
1617+
checksum = "1a3275464d7a9f2d4cac57c89c2ef96a8524dba2864c8d6f82e3980baf136f9b"
16031618
dependencies = [
1604-
"cfg-if",
1605-
"hashbrown 0.14.5",
1619+
"hashbrown 0.15.2",
16061620
"serde",
16071621
]
16081622

@@ -1684,7 +1698,16 @@ version = "1.0.69"
16841698
source = "registry+https://github.com/rust-lang/crates.io-index"
16851699
checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
16861700
dependencies = [
1687-
"thiserror-impl",
1701+
"thiserror-impl 1.0.69",
1702+
]
1703+
1704+
[[package]]
1705+
name = "thiserror"
1706+
version = "2.0.6"
1707+
source = "registry+https://github.com/rust-lang/crates.io-index"
1708+
checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
1709+
dependencies = [
1710+
"thiserror-impl 2.0.6",
16881711
]
16891712

16901713
[[package]]
@@ -1698,6 +1721,17 @@ dependencies = [
16981721
"syn 2.0.90",
16991722
]
17001723

1724+
[[package]]
1725+
name = "thiserror-impl"
1726+
version = "2.0.6"
1727+
source = "registry+https://github.com/rust-lang/crates.io-index"
1728+
checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
1729+
dependencies = [
1730+
"proc-macro2",
1731+
"quote",
1732+
"syn 2.0.90",
1733+
]
1734+
17011735
[[package]]
17021736
name = "thread_local"
17031737
version = "1.1.8"
@@ -1747,7 +1781,7 @@ version = "0.1.5"
17471781
source = "registry+https://github.com/rust-lang/crates.io-index"
17481782
checksum = "8450ade61b78735ed7811cc14639462723d87a6cd748a41e7bfde554ac5033dd"
17491783
dependencies = [
1750-
"thiserror",
1784+
"thiserror 1.0.69",
17511785
]
17521786

17531787
[[package]]
@@ -1900,30 +1934,31 @@ dependencies = [
19001934

19011935
[[package]]
19021936
name = "tree-sitter"
1903-
version = "0.23.2"
1937+
version = "0.24.5"
19041938
source = "registry+https://github.com/rust-lang/crates.io-index"
1905-
checksum = "0203df02a3b6dd63575cc1d6e609edc2181c9a11867a271b25cfd2abff3ec5ca"
1939+
checksum = "8ac95b18f0f727aaaa012bd5179a1916706ee3ed071920fdbda738750b0c0bf5"
19061940
dependencies = [
19071941
"cc",
19081942
"regex",
19091943
"regex-syntax 0.8.5",
1944+
"streaming-iterator",
19101945
"tree-sitter-language",
19111946
]
19121947

19131948
[[package]]
19141949
name = "tree-sitter-language"
1915-
version = "0.1.2"
1950+
version = "0.1.3"
19161951
source = "registry+https://github.com/rust-lang/crates.io-index"
1917-
checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600"
1952+
checksum = "c199356c799a8945965bb5f2c55b2ad9d9aa7c4b4f6e587fe9dea0bc715e5f9c"
19181953

19191954
[[package]]
19201955
name = "tree-sitter-rust"
1921-
version = "0.21.2"
1956+
version = "0.23.2"
19221957
source = "registry+https://github.com/rust-lang/crates.io-index"
1923-
checksum = "277690f420bf90741dea984f3da038ace46c4fe6047cba57a66822226cde1c93"
1958+
checksum = "a4d64d449ca63e683c562c7743946a646671ca23947b9c925c0cfbe65051a4af"
19241959
dependencies = [
19251960
"cc",
1926-
"tree-sitter",
1961+
"tree-sitter-language",
19271962
]
19281963

19291964
[[package]]
@@ -2017,6 +2052,18 @@ dependencies = [
20172052
"winsafe",
20182053
]
20192054

2055+
[[package]]
2056+
name = "which"
2057+
version = "7.0.0"
2058+
source = "registry+https://github.com/rust-lang/crates.io-index"
2059+
checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
2060+
dependencies = [
2061+
"either",
2062+
"home",
2063+
"rustix",
2064+
"winsafe",
2065+
]
2066+
20202067
[[package]]
20212068
name = "winapi"
20222069
version = "0.3.9"

‎cprover_bindings/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ lazy_static = "1.4.0"
1717
num = "0.4.0"
1818
num-traits = "0.2"
1919
serde = {version = "1", features = ["derive"]}
20-
string-interner = "0.17.0"
20+
string-interner = "0.18"
2121
tracing = "0.1"
2222
linear-map = {version = "1.2", features = ["serde_impl"]}
2323

‎deny.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ yanked = "deny"
1616
allow = [
1717
"MIT",
1818
"Apache-2.0",
19-
"MPL-2.0",
2019
]
2120
confidence-threshold = 0.8
2221

2322
# All these exceptions should probably appear in: tools/build-kani/license-notes.txt
2423
exceptions = [
2524
{ name = "unicode-ident", allow=["Unicode-3.0"] },
26-
{ name = "rustc_apfloat", allow=["Apache-2.0 WITH LLVM-exception"] },
25+
{ name = "foldhash", allow=["Zlib"] },
2726
]
2827

2928
[licenses.private]
@@ -43,4 +42,3 @@ wildcards = "allow"
4342
unknown-registry = "deny"
4443
unknown-git = "deny"
4544
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
46-
allow-git = ["https://github.com/Nadrieril/tracing-tree"]

‎kani-driver/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish = false
1313

1414
[dependencies]
1515
kani_metadata = { path = "../kani_metadata" }
16-
cargo_metadata = "0.18.0"
16+
cargo_metadata = "0.19"
1717
anyhow = "1"
1818
console = "0.15.1"
1919
once_cell = "1.19.0"
@@ -35,7 +35,7 @@ tempfile = "3"
3535
tracing = {version = "0.1", features = ["max_level_trace", "release_max_level_debug"]}
3636
tracing-subscriber = {version = "0.3.8", features = ["env-filter", "json", "fmt"]}
3737
rand = "0.8"
38-
which = "6"
38+
which = "7"
3939
time = {version = "0.3.36", features = ["formatting"]}
4040
tokio = { version = "1.40.0", features = ["io-util", "process", "rt", "time"] }
4141

0 commit comments

Comments
 (0)