mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-10-29 02:52:11 +00:00
Merge pull request #19430 from Veykril/push-wknpypxuyrsz
chore: Bump dependencies
This commit is contained in:
commit
d9b08e4431
37 changed files with 231 additions and 200 deletions
175
Cargo.lock
generated
175
Cargo.lock
generated
|
|
@ -43,6 +43,9 @@ name = "arbitrary"
|
||||||
version = "1.4.1"
|
version = "1.4.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
|
checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
|
||||||
|
dependencies = [
|
||||||
|
"derive_arbitrary",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arrayvec"
|
name = "arrayvec"
|
||||||
|
|
@ -66,7 +69,7 @@ dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"libc",
|
"libc",
|
||||||
"miniz_oxide",
|
"miniz_oxide",
|
||||||
"object 0.36.7",
|
"object",
|
||||||
"rustc-demangle",
|
"rustc-demangle",
|
||||||
"windows-targets 0.52.6",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
@ -126,12 +129,6 @@ dependencies = [
|
||||||
"loom",
|
"loom",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "byteorder"
|
|
||||||
version = "1.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "camino"
|
name = "camino"
|
||||||
version = "1.1.9"
|
version = "1.1.9"
|
||||||
|
|
@ -152,16 +149,16 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cargo_metadata"
|
name = "cargo_metadata"
|
||||||
version = "0.18.1"
|
version = "0.19.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
|
checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"camino",
|
"camino",
|
||||||
"cargo-platform",
|
"cargo-platform",
|
||||||
"semver",
|
"semver",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"thiserror",
|
"thiserror 2.0.12",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -246,7 +243,7 @@ dependencies = [
|
||||||
"chalk-ir",
|
"chalk-ir",
|
||||||
"ena",
|
"ena",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"itertools",
|
"itertools 0.12.1",
|
||||||
"petgraph",
|
"petgraph",
|
||||||
"rustc-hash 1.1.0",
|
"rustc-hash 1.1.0",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
|
@ -355,9 +352,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deranged"
|
name = "deranged"
|
||||||
version = "0.3.11"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
|
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"powerfmt",
|
"powerfmt",
|
||||||
]
|
]
|
||||||
|
|
@ -375,32 +372,32 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "directories"
|
name = "directories"
|
||||||
version = "5.0.1"
|
version = "6.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
|
checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dirs-sys",
|
"dirs-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dirs"
|
name = "dirs"
|
||||||
version = "5.0.1"
|
version = "6.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
|
checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dirs-sys",
|
"dirs-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dirs-sys"
|
name = "dirs-sys"
|
||||||
version = "0.4.1"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
|
checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"option-ext",
|
"option-ext",
|
||||||
"redox_users",
|
"redox_users",
|
||||||
"windows-sys 0.48.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -607,7 +604,7 @@ dependencies = [
|
||||||
"hir-ty",
|
"hir-ty",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"intern",
|
"intern",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"rustc-hash 2.1.1",
|
"rustc-hash 2.1.1",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"span",
|
"span",
|
||||||
|
|
@ -637,7 +634,7 @@ dependencies = [
|
||||||
"hir-expand",
|
"hir-expand",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"intern",
|
"intern",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"mbe",
|
"mbe",
|
||||||
"query-group-macro",
|
"query-group-macro",
|
||||||
|
|
@ -669,7 +666,7 @@ dependencies = [
|
||||||
"either",
|
"either",
|
||||||
"expect-test",
|
"expect-test",
|
||||||
"intern",
|
"intern",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"mbe",
|
"mbe",
|
||||||
"parser",
|
"parser",
|
||||||
"query-group-macro",
|
"query-group-macro",
|
||||||
|
|
@ -704,7 +701,7 @@ dependencies = [
|
||||||
"hir-expand",
|
"hir-expand",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"intern",
|
"intern",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"oorandom",
|
"oorandom",
|
||||||
"project-model",
|
"project-model",
|
||||||
|
|
@ -872,7 +869,7 @@ dependencies = [
|
||||||
"ide-db",
|
"ide-db",
|
||||||
"ide-diagnostics",
|
"ide-diagnostics",
|
||||||
"ide-ssr",
|
"ide-ssr",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"nohash-hasher",
|
"nohash-hasher",
|
||||||
"oorandom",
|
"oorandom",
|
||||||
"profile",
|
"profile",
|
||||||
|
|
@ -900,7 +897,7 @@ dependencies = [
|
||||||
"expect-test",
|
"expect-test",
|
||||||
"hir",
|
"hir",
|
||||||
"ide-db",
|
"ide-db",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"stdx",
|
"stdx",
|
||||||
"syntax",
|
"syntax",
|
||||||
|
|
@ -918,7 +915,7 @@ dependencies = [
|
||||||
"expect-test",
|
"expect-test",
|
||||||
"hir",
|
"hir",
|
||||||
"ide-db",
|
"ide-db",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"stdx",
|
"stdx",
|
||||||
"syntax",
|
"syntax",
|
||||||
|
|
@ -941,7 +938,7 @@ dependencies = [
|
||||||
"fst",
|
"fst",
|
||||||
"hir",
|
"hir",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"line-index 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
"line-index 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"memchr",
|
"memchr",
|
||||||
"nohash-hasher",
|
"nohash-hasher",
|
||||||
|
|
@ -971,7 +968,7 @@ dependencies = [
|
||||||
"expect-test",
|
"expect-test",
|
||||||
"hir",
|
"hir",
|
||||||
"ide-db",
|
"ide-db",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"paths",
|
"paths",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"stdx",
|
"stdx",
|
||||||
|
|
@ -989,7 +986,7 @@ dependencies = [
|
||||||
"expect-test",
|
"expect-test",
|
||||||
"hir",
|
"hir",
|
||||||
"ide-db",
|
"ide-db",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"parser",
|
"parser",
|
||||||
"syntax",
|
"syntax",
|
||||||
"test-fixture",
|
"test-fixture",
|
||||||
|
|
@ -1020,9 +1017,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "2.7.1"
|
version = "2.8.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
|
checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"equivalent",
|
"equivalent",
|
||||||
"hashbrown 0.15.2",
|
"hashbrown 0.15.2",
|
||||||
|
|
@ -1068,6 +1065,15 @@ dependencies = [
|
||||||
"either",
|
"either",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "itertools"
|
||||||
|
version = "0.14.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
|
||||||
|
dependencies = [
|
||||||
|
"either",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itoa"
|
name = "itoa"
|
||||||
version = "1.0.15"
|
version = "1.0.15"
|
||||||
|
|
@ -1118,9 +1124,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.170"
|
version = "0.2.171"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
|
checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libloading"
|
name = "libloading"
|
||||||
|
|
@ -1134,9 +1140,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libmimalloc-sys"
|
name = "libmimalloc-sys"
|
||||||
version = "0.1.39"
|
version = "0.1.40"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
|
checksum = "07d0e07885d6a754b9c7993f2625187ad694ee985d60f23355ff0e7077261502"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
|
|
@ -1187,7 +1193,7 @@ dependencies = [
|
||||||
"hir-expand",
|
"hir-expand",
|
||||||
"ide-db",
|
"ide-db",
|
||||||
"intern",
|
"intern",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"proc-macro-api",
|
"proc-macro-api",
|
||||||
"project-model",
|
"project-model",
|
||||||
"span",
|
"span",
|
||||||
|
|
@ -1302,9 +1308,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memmap2"
|
name = "memmap2"
|
||||||
version = "0.5.10"
|
version = "0.9.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
|
checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
@ -1320,9 +1326,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mimalloc"
|
name = "mimalloc"
|
||||||
version = "0.1.43"
|
version = "0.1.44"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
|
checksum = "99585191385958383e13f6b822e6b6d8d9cf928e7d286ceb092da92b43c87bc1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libmimalloc-sys",
|
"libmimalloc-sys",
|
||||||
]
|
]
|
||||||
|
|
@ -1444,15 +1450,6 @@ dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "object"
|
|
||||||
version = "0.33.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d"
|
|
||||||
dependencies = [
|
|
||||||
"memchr",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "object"
|
name = "object"
|
||||||
version = "0.36.7"
|
version = "0.36.7"
|
||||||
|
|
@ -1464,9 +1461,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "once_cell"
|
name = "once_cell"
|
||||||
version = "1.21.0"
|
version = "1.21.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad"
|
checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "oorandom"
|
name = "oorandom"
|
||||||
|
|
@ -1613,7 +1610,7 @@ dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"libloading",
|
"libloading",
|
||||||
"memmap2",
|
"memmap2",
|
||||||
"object 0.33.0",
|
"object",
|
||||||
"paths",
|
"paths",
|
||||||
"proc-macro-test",
|
"proc-macro-test",
|
||||||
"ra-ap-rustc_lexer",
|
"ra-ap-rustc_lexer",
|
||||||
|
|
@ -1680,7 +1677,7 @@ dependencies = [
|
||||||
"cfg",
|
"cfg",
|
||||||
"expect-test",
|
"expect-test",
|
||||||
"intern",
|
"intern",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"paths",
|
"paths",
|
||||||
"rustc-hash 2.1.1",
|
"rustc-hash 2.1.1",
|
||||||
|
|
@ -1703,7 +1700,7 @@ checksum = "a3a7c64d9bf75b1b8d981124c14c179074e8caa7dfe7b6a12e6222ddcd0c8f72"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"protobuf-support",
|
"protobuf-support",
|
||||||
"thiserror",
|
"thiserror 1.0.69",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -1712,7 +1709,7 @@ version = "3.7.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252"
|
checksum = "b088fd20b938a875ea00843b6faf48579462630015c3788d397ad6a786663252"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"thiserror",
|
"thiserror 1.0.69",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -1748,9 +1745,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.39"
|
version = "1.0.40"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
|
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
|
|
@ -1862,13 +1859,13 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_users"
|
name = "redox_users"
|
||||||
version = "0.4.6"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
|
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"getrandom",
|
"getrandom",
|
||||||
"libredox",
|
"libredox",
|
||||||
"thiserror",
|
"thiserror 2.0.12",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -1949,7 +1946,7 @@ dependencies = [
|
||||||
"ide-ssr",
|
"ide-ssr",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"intern",
|
"intern",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"load-cargo",
|
"load-cargo",
|
||||||
"lsp-server 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"lsp-server 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"lsp-types",
|
"lsp-types",
|
||||||
|
|
@ -2229,7 +2226,7 @@ version = "0.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"backtrace",
|
"backtrace",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"jod-thread",
|
"jod-thread",
|
||||||
"libc",
|
"libc",
|
||||||
"miow",
|
"miow",
|
||||||
|
|
@ -2265,7 +2262,7 @@ version = "0.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"either",
|
"either",
|
||||||
"expect-test",
|
"expect-test",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"parser",
|
"parser",
|
||||||
"ra-ap-rustc_lexer",
|
"ra-ap-rustc_lexer",
|
||||||
"rayon",
|
"rayon",
|
||||||
|
|
@ -2339,7 +2336,16 @@ version = "1.0.69"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
|
checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"thiserror-impl",
|
"thiserror-impl 1.0.69",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror"
|
||||||
|
version = "2.0.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
|
||||||
|
dependencies = [
|
||||||
|
"thiserror-impl 2.0.12",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -2353,6 +2359,17 @@ dependencies = [
|
||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror-impl"
|
||||||
|
version = "2.0.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thread_local"
|
name = "thread_local"
|
||||||
version = "1.1.8"
|
version = "1.1.8"
|
||||||
|
|
@ -2396,9 +2413,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time"
|
name = "time"
|
||||||
version = "0.3.39"
|
version = "0.3.40"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
|
checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"deranged",
|
"deranged",
|
||||||
"itoa",
|
"itoa",
|
||||||
|
|
@ -2413,15 +2430,15 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time-core"
|
name = "time-core"
|
||||||
version = "0.1.3"
|
version = "0.1.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
|
checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time-macros"
|
name = "time-macros"
|
||||||
version = "0.2.20"
|
version = "0.2.21"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
|
checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"num-conv",
|
"num-conv",
|
||||||
"time-core",
|
"time-core",
|
||||||
|
|
@ -2543,9 +2560,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-tree"
|
name = "tracing-tree"
|
||||||
version = "0.3.1"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b56c62d2c80033cb36fae448730a2f2ef99410fe3ecbffc916681a32f6807dbe"
|
checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"nu-ansi-term 0.50.1",
|
"nu-ansi-term 0.50.1",
|
||||||
"tracing-core",
|
"tracing-core",
|
||||||
|
|
@ -3123,7 +3140,7 @@ dependencies = [
|
||||||
"edition",
|
"edition",
|
||||||
"either",
|
"either",
|
||||||
"flate2",
|
"flate2",
|
||||||
"itertools",
|
"itertools 0.14.0",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"stdx",
|
"stdx",
|
||||||
|
|
@ -3204,13 +3221,17 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zip"
|
name = "zip"
|
||||||
version = "0.6.6"
|
version = "2.4.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
|
checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder",
|
"arbitrary",
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
|
"displaydoc",
|
||||||
"flate2",
|
"flate2",
|
||||||
|
"indexmap",
|
||||||
|
"memchr",
|
||||||
|
"thiserror 2.0.12",
|
||||||
"time",
|
"time",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
69
Cargo.toml
69
Cargo.toml
|
|
@ -97,60 +97,57 @@ ra-ap-rustc_pattern_analysis = { version = "0.100", default-features = false }
|
||||||
# in-tree crates that are published separately and follow semver. See lib/README.md
|
# in-tree crates that are published separately and follow semver. See lib/README.md
|
||||||
line-index = { version = "0.1.2" }
|
line-index = { version = "0.1.2" }
|
||||||
la-arena = { version = "0.3.1" }
|
la-arena = { version = "0.3.1" }
|
||||||
lsp-server = { version = "0.7.6" }
|
lsp-server = { version = "0.7.8" }
|
||||||
|
|
||||||
# non-local crates
|
# non-local crates
|
||||||
anyhow = "1.0.75"
|
anyhow = "1.0.97"
|
||||||
arrayvec = "0.7.4"
|
arrayvec = "0.7.6"
|
||||||
bitflags = "2.4.1"
|
bitflags = "2.9.0"
|
||||||
cargo_metadata = "0.18.1"
|
cargo_metadata = "0.19.2"
|
||||||
camino = "1.1.6"
|
camino = "1.1.9"
|
||||||
chalk-solve = { version = "0.100.0", default-features = false }
|
chalk-solve = { version = "0.100.0", default-features = false }
|
||||||
chalk-ir = "0.100.0"
|
chalk-ir = "0.100.0"
|
||||||
chalk-recursive = { version = "0.100.0", default-features = false }
|
chalk-recursive = { version = "0.100.0", default-features = false }
|
||||||
chalk-derive = "0.100.0"
|
chalk-derive = "0.100.0"
|
||||||
crossbeam-channel = "0.5.8"
|
crossbeam-channel = "0.5.14"
|
||||||
dissimilar = "1.0.7"
|
dissimilar = "1.0.10"
|
||||||
dot = "0.1.4"
|
dot = "0.1.4"
|
||||||
either = "1.9.0"
|
either = "1.15.0"
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
hashbrown = { version = "0.14", features = [
|
indexmap = { version = "2.8.0", features = ["serde"] }
|
||||||
"inline-more",
|
itertools = "0.14.0"
|
||||||
], default-features = false }
|
libc = "0.2.171"
|
||||||
indexmap = { version = "2.1.0", features = ["serde"] }
|
libloading = "0.8.6"
|
||||||
itertools = "0.12.0"
|
memmap2 = "0.9.5"
|
||||||
libc = "0.2.150"
|
|
||||||
libloading = "0.8.0"
|
|
||||||
memmap2 = "0.5.4"
|
|
||||||
nohash-hasher = "0.2.0"
|
nohash-hasher = "0.2.0"
|
||||||
oorandom = "11.1.3"
|
oorandom = "11.1.5"
|
||||||
object = { version = "0.33.0", default-features = false, features = [
|
object = { version = "0.36.7", default-features = false, features = [
|
||||||
"std",
|
"std",
|
||||||
"read_core",
|
"read_core",
|
||||||
"elf",
|
"elf",
|
||||||
"macho",
|
"macho",
|
||||||
"pe",
|
"pe",
|
||||||
] }
|
] }
|
||||||
process-wrap = { version = "8.0.2", features = ["std"] }
|
process-wrap = { version = "8.2.0", features = ["std"] }
|
||||||
pulldown-cmark-to-cmark = "10.0.4"
|
pulldown-cmark-to-cmark = "10.0.4"
|
||||||
pulldown-cmark = { version = "0.9.0", default-features = false }
|
pulldown-cmark = { version = "0.9.6", default-features = false }
|
||||||
rayon = "1.8.0"
|
rayon = "1.10.0"
|
||||||
salsa = "0.19"
|
salsa = "0.19"
|
||||||
rustc-hash = "2.0.0"
|
rustc-hash = "2.1.1"
|
||||||
semver = "1.0.14"
|
semver = "1.0.26"
|
||||||
serde = { version = "1.0.192" }
|
serde = { version = "1.0.219" }
|
||||||
serde_derive = { version = "1.0.192" }
|
serde_derive = { version = "1.0.219" }
|
||||||
serde_json = "1.0.108"
|
serde_json = "1.0.140"
|
||||||
smallvec = { version = "1.10.0", features = [
|
smallvec = { version = "1.14.0", features = [
|
||||||
"const_new",
|
"const_new",
|
||||||
"union",
|
"union",
|
||||||
"const_generics",
|
"const_generics",
|
||||||
] }
|
] }
|
||||||
smol_str = "0.3.2"
|
smol_str = "0.3.2"
|
||||||
text-size = "1.1.1"
|
text-size = "1.1.1"
|
||||||
tracing = "0.1.40"
|
tracing = "0.1.41"
|
||||||
tracing-tree = "0.3.0"
|
tracing-tree = "0.4.0"
|
||||||
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
|
tracing-subscriber = { version = "0.3.19", default-features = false, features = [
|
||||||
"registry",
|
"registry",
|
||||||
"fmt",
|
"fmt",
|
||||||
"local-time",
|
"local-time",
|
||||||
|
|
@ -159,12 +156,16 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
|
||||||
"tracing-log",
|
"tracing-log",
|
||||||
] }
|
] }
|
||||||
triomphe = { version = "0.1.14", default-features = false, features = ["std"] }
|
triomphe = { version = "0.1.14", default-features = false, features = ["std"] }
|
||||||
url = "2.3.1"
|
url = "2.5.4"
|
||||||
xshell = "0.2.5"
|
xshell = "0.2.7"
|
||||||
|
|
||||||
|
|
||||||
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
|
# We need to freeze the version of the crate, as the raw-api feature is considered unstable
|
||||||
dashmap = { version = "=5.5.3", features = ["raw-api"] }
|
dashmap = { version = "=5.5.3", features = ["raw-api"] }
|
||||||
|
# We need to freeze the version of the crate, as it needs to match with dashmap
|
||||||
|
hashbrown = { version = "=0.14.5", features = [
|
||||||
|
"inline-more",
|
||||||
|
], default-features = false }
|
||||||
|
|
||||||
[workspace.lints.rust]
|
[workspace.lints.rust]
|
||||||
# remember to update RUSTFLAGS in ci.yml if you add something here
|
# remember to update RUSTFLAGS in ci.yml if you add something here
|
||||||
|
|
|
||||||
|
|
@ -20,13 +20,13 @@ tt = { workspace = true, optional = true }
|
||||||
intern.workspace = true
|
intern.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.1"
|
expect-test = "1.5.1"
|
||||||
oorandom = "11.1.3"
|
oorandom = "11.1.5"
|
||||||
# We depend on both individually instead of using `features = ["derive"]` to microoptimize the
|
# We depend on both individually instead of using `features = ["derive"]` to microoptimize the
|
||||||
# build graph: if the feature was enabled, syn would be built early on in the graph if `smolstr`
|
# build graph: if the feature was enabled, syn would be built early on in the graph if `smolstr`
|
||||||
# supports `arbitrary`. This way, we avoid feature unification.
|
# supports `arbitrary`. This way, we avoid feature unification.
|
||||||
arbitrary = "1.3.2"
|
arbitrary = "1.4.1"
|
||||||
derive_arbitrary = "1.3.2"
|
derive_arbitrary = "1.4.1"
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
syntax-bridge.workspace = true
|
syntax-bridge.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ rust-version.workspace = true
|
||||||
[dependencies]
|
[dependencies]
|
||||||
arrayvec.workspace = true
|
arrayvec.workspace = true
|
||||||
bitflags.workspace = true
|
bitflags.workspace = true
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
drop_bomb = "0.1.5"
|
drop_bomb = "0.1.5"
|
||||||
either.workspace = true
|
either.workspace = true
|
||||||
fst = { version = "0.4.7", default-features = false }
|
fst = { version = "0.4.7", default-features = false }
|
||||||
|
|
@ -25,7 +25,7 @@ rustc-hash.workspace = true
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
smallvec.workspace = true
|
smallvec.workspace = true
|
||||||
triomphe.workspace = true
|
triomphe.workspace = true
|
||||||
rustc_apfloat = "0.2.0"
|
rustc_apfloat = "0.2.2"
|
||||||
text-size.workspace = true
|
text-size.workspace = true
|
||||||
salsa.workspace = true
|
salsa.workspace = true
|
||||||
query-group.workspace = true
|
query-group.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
either.workspace = true
|
either.workspace = true
|
||||||
rustc-hash.workspace = true
|
rustc-hash.workspace = true
|
||||||
|
|
@ -35,7 +35,7 @@ parser.workspace = true
|
||||||
syntax-bridge.workspace = true
|
syntax-bridge.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
in-rust-tree = ["syntax/in-rust-tree"]
|
in-rust-tree = ["syntax/in-rust-tree"]
|
||||||
|
|
|
||||||
|
|
@ -12,26 +12,26 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
arrayvec.workspace = true
|
arrayvec.workspace = true
|
||||||
bitflags.workspace = true
|
bitflags.workspace = true
|
||||||
smallvec.workspace = true
|
smallvec.workspace = true
|
||||||
ena = "0.14.0"
|
ena = "0.14.3"
|
||||||
either.workspace = true
|
either.workspace = true
|
||||||
oorandom = "11.1.3"
|
oorandom = "11.1.5"
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
rustc-hash.workspace = true
|
rustc-hash.workspace = true
|
||||||
scoped-tls = "1.0.0"
|
scoped-tls = "1.0.1"
|
||||||
chalk-solve.workspace = true
|
chalk-solve.workspace = true
|
||||||
chalk-ir.workspace = true
|
chalk-ir.workspace = true
|
||||||
chalk-recursive.workspace = true
|
chalk-recursive.workspace = true
|
||||||
chalk-derive.workspace = true
|
chalk-derive.workspace = true
|
||||||
la-arena.workspace = true
|
la-arena.workspace = true
|
||||||
triomphe.workspace = true
|
triomphe.workspace = true
|
||||||
typed-arena = "2.0.1"
|
typed-arena = "2.0.2"
|
||||||
indexmap.workspace = true
|
indexmap.workspace = true
|
||||||
rustc_apfloat = "0.2.0"
|
rustc_apfloat = "0.2.2"
|
||||||
query-group.workspace = true
|
query-group.workspace = true
|
||||||
salsa.workspace = true
|
salsa.workspace = true
|
||||||
|
|
||||||
|
|
@ -50,7 +50,7 @@ syntax.workspace = true
|
||||||
span.workspace = true
|
span.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
tracing-subscriber.workspace = true
|
tracing-subscriber.workspace = true
|
||||||
tracing-tree.workspace = true
|
tracing-tree.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -1221,15 +1221,15 @@ fn precise_macro_call_location(
|
||||||
.nth(derive_attr_index.ast_index())
|
.nth(derive_attr_index.ast_index())
|
||||||
.and_then(|x| Either::left(x.1))?;
|
.and_then(|x| Either::left(x.1))?;
|
||||||
let token_tree = derive_attr.meta()?.token_tree()?;
|
let token_tree = derive_attr.meta()?.token_tree()?;
|
||||||
let group_by = token_tree
|
let chunk_by = token_tree
|
||||||
.syntax()
|
.syntax()
|
||||||
.children_with_tokens()
|
.children_with_tokens()
|
||||||
.filter_map(|elem| match elem {
|
.filter_map(|elem| match elem {
|
||||||
syntax::NodeOrToken::Token(tok) => Some(tok),
|
syntax::NodeOrToken::Token(tok) => Some(tok),
|
||||||
_ => None,
|
_ => None,
|
||||||
})
|
})
|
||||||
.group_by(|t| t.kind() == T![,]);
|
.chunk_by(|t| t.kind() == T![,]);
|
||||||
let (_, mut group) = group_by
|
let (_, mut group) = chunk_by
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter(|&(comma, _)| !comma)
|
.filter(|&(comma, _)| !comma)
|
||||||
.nth(*derive_index as usize)?;
|
.nth(*derive_index as usize)?;
|
||||||
|
|
|
||||||
|
|
@ -929,7 +929,7 @@ impl SourceAnalyzer {
|
||||||
// FIXME: Multiple derives can have the same helper
|
// FIXME: Multiple derives can have the same helper
|
||||||
let name_ref = name_ref.as_name();
|
let name_ref = name_ref.as_name();
|
||||||
for (macro_id, mut helpers) in
|
for (macro_id, mut helpers) in
|
||||||
helpers.iter().group_by(|(_, macro_id, ..)| macro_id).into_iter()
|
helpers.iter().chunk_by(|(_, macro_id, ..)| macro_id).into_iter()
|
||||||
{
|
{
|
||||||
if let Some(idx) = helpers.position(|(name, ..)| *name == name_ref)
|
if let Some(idx) = helpers.position(|(name, ..)| *name == name_ref)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
|
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
either.workspace = true
|
either.workspace = true
|
||||||
|
|
@ -26,7 +26,7 @@ ide-db.workspace = true
|
||||||
hir.workspace = true
|
hir.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ fn compute_dbg_replacement(macro_expr: ast::MacroExpr) -> Option<(TextRange, Opt
|
||||||
}
|
}
|
||||||
|
|
||||||
let mac_input = tt.syntax().children_with_tokens().skip(1).take_while(|it| *it != r_delim);
|
let mac_input = tt.syntax().children_with_tokens().skip(1).take_while(|it| *it != r_delim);
|
||||||
let input_expressions = mac_input.group_by(|tok| tok.kind() == T![,]);
|
let input_expressions = mac_input.chunk_by(|tok| tok.kind() == T![,]);
|
||||||
let input_expressions = input_expressions
|
let input_expressions = input_expressions
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter_map(|(is_sep, group)| (!is_sep).then_some(group))
|
.filter_map(|(is_sep, group)| (!is_sep).then_some(group))
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
|
|
||||||
|
|
@ -29,7 +29,7 @@ syntax.workspace = true
|
||||||
hir.workspace = true
|
hir.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -380,7 +380,7 @@ fn parse_comma_sep_expr(input: ast::TokenTree) -> Option<Vec<ast::Expr>> {
|
||||||
.children_with_tokens()
|
.children_with_tokens()
|
||||||
.skip(1)
|
.skip(1)
|
||||||
.take_while(|it| it.as_token() != Some(&r_paren));
|
.take_while(|it| it.as_token() != Some(&r_paren));
|
||||||
let input_expressions = tokens.group_by(|tok| tok.kind() == T![,]);
|
let input_expressions = tokens.chunk_by(|tok| tok.kind() == T![,]);
|
||||||
Some(
|
Some(
|
||||||
input_expressions
|
input_expressions
|
||||||
.into_iter()
|
.into_iter()
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
crossbeam-channel.workspace = true
|
crossbeam-channel.workspace = true
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
rayon.workspace = true
|
rayon.workspace = true
|
||||||
|
|
@ -22,7 +22,7 @@ either.workspace = true
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
arrayvec.workspace = true
|
arrayvec.workspace = true
|
||||||
indexmap.workspace = true
|
indexmap.workspace = true
|
||||||
memchr = "2.6.4"
|
memchr = "2.7.4"
|
||||||
salsa.workspace = true
|
salsa.workspace = true
|
||||||
query-group.workspace = true
|
query-group.workspace = true
|
||||||
triomphe.workspace = true
|
triomphe.workspace = true
|
||||||
|
|
@ -44,7 +44,7 @@ hir.workspace = true
|
||||||
line-index.workspace = true
|
line-index.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -484,7 +484,7 @@ pub fn parse_tt_as_comma_sep_paths(
|
||||||
None => None,
|
None => None,
|
||||||
Some(tok) => Some(tok),
|
Some(tok) => Some(tok),
|
||||||
});
|
});
|
||||||
let input_expressions = tokens.group_by(|tok| tok.kind() == T![,]);
|
let input_expressions = tokens.chunk_by(|tok| tok.kind() == T![,]);
|
||||||
let paths = input_expressions
|
let paths = input_expressions
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter_map(|(is_sep, group)| (!is_sep).then_some(group))
|
.filter_map(|(is_sep, group)| (!is_sep).then_some(group))
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
either.workspace = true
|
either.workspace = true
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
serde_json.workspace = true
|
serde_json.workspace = true
|
||||||
|
|
@ -27,7 +27,7 @@ ide-db.workspace = true
|
||||||
paths.workspace = true
|
paths.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
|
|
@ -22,7 +22,7 @@ parser.workspace = true
|
||||||
syntax.workspace = true
|
syntax.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
triomphe.workspace = true
|
triomphe.workspace = true
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
arrayvec.workspace = true
|
arrayvec.workspace = true
|
||||||
either.workspace = true
|
either.workspace = true
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
|
|
@ -25,7 +25,7 @@ dot.workspace = true
|
||||||
smallvec.workspace = true
|
smallvec.workspace = true
|
||||||
triomphe.workspace = true
|
triomphe.workspace = true
|
||||||
nohash-hasher.workspace = true
|
nohash-hasher.workspace = true
|
||||||
rustc_apfloat = "0.2.0"
|
rustc_apfloat = "0.2.2"
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
cfg.workspace = true
|
cfg.workspace = true
|
||||||
|
|
@ -46,7 +46,7 @@ hir.workspace = true
|
||||||
toolchain.workspace = true
|
toolchain.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
# local deps
|
# local deps
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cov-mark = "2.0.0-pre.1"
|
cov-mark = "2.0.0"
|
||||||
rustc-hash.workspace = true
|
rustc-hash.workspace = true
|
||||||
smallvec.workspace = true
|
smallvec.workspace = true
|
||||||
arrayvec.workspace = true
|
arrayvec.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ tracing = { workspace = true, optional = true }
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
stdx.workspace = true
|
stdx.workspace = true
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@ license = "MIT OR Apache-2.0"
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
cargo_metadata = "0.18.1"
|
cargo_metadata = "0.19.2"
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ fn main() {
|
||||||
let mut artifact_path = None;
|
let mut artifact_path = None;
|
||||||
for message in Message::parse_stream(output.stdout.as_slice()) {
|
for message in Message::parse_stream(output.stdout.as_slice()) {
|
||||||
if let Message::CompilerArtifact(artifact) = message.unwrap() {
|
if let Message::CompilerArtifact(artifact) = message.unwrap() {
|
||||||
if artifact.target.kind.contains(&"proc-macro".to_string())
|
if artifact.target.kind.contains(&cargo_metadata::TargetKind::ProcMacro)
|
||||||
&& (artifact.package_id.repr.starts_with(&repr)
|
&& (artifact.package_id.repr.starts_with(&repr)
|
||||||
|| artifact.package_id.repr == pkgid)
|
|| artifact.package_id.repr == pkgid)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ rust-version.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cfg-if = "1.0.0"
|
cfg-if = "1.0.0"
|
||||||
jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }
|
jemalloc-ctl = { version = "0.5.4", package = "tikv-jemalloc-ctl", optional = true }
|
||||||
|
|
||||||
[target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
|
[target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
|
||||||
perf-event = "=0.4.7"
|
perf-event = "=0.4.7"
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ stdx.workspace = true
|
||||||
toolchain.workspace = true
|
toolchain.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|
|
||||||
|
|
@ -343,7 +343,12 @@ impl WorkspaceBuildScripts {
|
||||||
Message::CompilerArtifact(message) => {
|
Message::CompilerArtifact(message) => {
|
||||||
with_output_for(&message.package_id.repr, &mut |name, data| {
|
with_output_for(&message.package_id.repr, &mut |name, data| {
|
||||||
progress(format!("building proc-macros: {name}"));
|
progress(format!("building proc-macros: {name}"));
|
||||||
if message.target.kind.iter().any(|k| k == "proc-macro") {
|
if message
|
||||||
|
.target
|
||||||
|
.kind
|
||||||
|
.iter()
|
||||||
|
.any(|k| *k == cargo_metadata::TargetKind::ProcMacro)
|
||||||
|
{
|
||||||
// Skip rmeta file
|
// Skip rmeta file
|
||||||
if let Some(filename) =
|
if let Some(filename) =
|
||||||
message.filenames.iter().find(|file| is_dylib(file))
|
message.filenames.iter().find(|file| is_dylib(file))
|
||||||
|
|
|
||||||
|
|
@ -232,16 +232,20 @@ pub enum TargetKind {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TargetKind {
|
impl TargetKind {
|
||||||
fn new(kinds: &[String]) -> TargetKind {
|
fn new(kinds: &[cargo_metadata::TargetKind]) -> TargetKind {
|
||||||
for kind in kinds {
|
for kind in kinds {
|
||||||
return match kind.as_str() {
|
return match kind {
|
||||||
"bin" => TargetKind::Bin,
|
cargo_metadata::TargetKind::Bin => TargetKind::Bin,
|
||||||
"test" => TargetKind::Test,
|
cargo_metadata::TargetKind::Test => TargetKind::Test,
|
||||||
"bench" => TargetKind::Bench,
|
cargo_metadata::TargetKind::Bench => TargetKind::Bench,
|
||||||
"example" => TargetKind::Example,
|
cargo_metadata::TargetKind::Example => TargetKind::Example,
|
||||||
"custom-build" => TargetKind::BuildScript,
|
cargo_metadata::TargetKind::CustomBuild => TargetKind::BuildScript,
|
||||||
"proc-macro" => TargetKind::Lib { is_proc_macro: true },
|
cargo_metadata::TargetKind::ProcMacro => TargetKind::Lib { is_proc_macro: true },
|
||||||
_ if kind.contains("lib") => TargetKind::Lib { is_proc_macro: false },
|
cargo_metadata::TargetKind::Lib
|
||||||
|
| cargo_metadata::TargetKind::DyLib
|
||||||
|
| cargo_metadata::TargetKind::CDyLib
|
||||||
|
| cargo_metadata::TargetKind::StaticLib
|
||||||
|
| cargo_metadata::TargetKind::RLib => TargetKind::Lib { is_proc_macro: false },
|
||||||
_ => continue,
|
_ => continue,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -476,7 +480,7 @@ impl CargoWorkspace {
|
||||||
cargo_metadata::Edition::E2015 => Edition::Edition2015,
|
cargo_metadata::Edition::E2015 => Edition::Edition2015,
|
||||||
cargo_metadata::Edition::E2018 => Edition::Edition2018,
|
cargo_metadata::Edition::E2018 => Edition::Edition2018,
|
||||||
cargo_metadata::Edition::E2021 => Edition::Edition2021,
|
cargo_metadata::Edition::E2021 => Edition::Edition2021,
|
||||||
cargo_metadata::Edition::_E2024 => Edition::Edition2024,
|
cargo_metadata::Edition::E2024 => Edition::Edition2024,
|
||||||
_ => {
|
_ => {
|
||||||
tracing::error!("Unsupported edition `{:?}`", edition);
|
tracing::error!("Unsupported edition `{:?}`", edition);
|
||||||
Edition::CURRENT
|
Edition::CURRENT
|
||||||
|
|
|
||||||
|
|
@ -18,5 +18,5 @@ quote = "1.0"
|
||||||
syn = { version = "2.0", features = ["full", "extra-traits"] }
|
syn = { version = "2.0", features = ["full", "extra-traits"] }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.5.0"
|
expect-test = "1.5.1"
|
||||||
salsa.workspace = true
|
salsa.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -22,34 +22,34 @@ path = "src/bin/main.rs"
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
crossbeam-channel.workspace = true
|
crossbeam-channel.workspace = true
|
||||||
dirs = "5.0.1"
|
dirs = "6.0.0"
|
||||||
dissimilar.workspace = true
|
dissimilar.workspace = true
|
||||||
ide-completion.workspace = true
|
ide-completion.workspace = true
|
||||||
indexmap.workspace = true
|
indexmap.workspace = true
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
scip = "0.5.1"
|
scip = "0.5.2"
|
||||||
lsp-types = { version = "=0.95.0", features = ["proposed"] }
|
lsp-types = { version = "=0.95.0", features = ["proposed"] }
|
||||||
parking_lot = "0.12.1"
|
parking_lot = "0.12.3"
|
||||||
xflags = "0.3.0"
|
xflags = "0.3.2"
|
||||||
oorandom = "11.1.3"
|
oorandom = "11.1.5"
|
||||||
rayon.workspace = true
|
rayon.workspace = true
|
||||||
rustc-hash.workspace = true
|
rustc-hash.workspace = true
|
||||||
serde_json = { workspace = true, features = ["preserve_order"] }
|
serde_json = { workspace = true, features = ["preserve_order"] }
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
serde_derive.workspace = true
|
serde_derive.workspace = true
|
||||||
tenthash = "1.0.0"
|
tenthash = "1.0.0"
|
||||||
num_cpus = "1.15.0"
|
num_cpus = "1.16.0"
|
||||||
mimalloc = { version = "0.1.30", default-features = false, optional = true }
|
mimalloc = { version = "0.1.44", default-features = false, optional = true }
|
||||||
lsp-server.workspace = true
|
lsp-server.workspace = true
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
tracing-subscriber.workspace = true
|
tracing-subscriber.workspace = true
|
||||||
tracing-tree.workspace = true
|
tracing-tree.workspace = true
|
||||||
triomphe.workspace = true
|
triomphe.workspace = true
|
||||||
toml = "0.8.8"
|
toml = "0.8.20"
|
||||||
nohash-hasher.workspace = true
|
nohash-hasher.workspace = true
|
||||||
walkdir = "2.3.2"
|
walkdir = "2.5.0"
|
||||||
semver.workspace = true
|
semver.workspace = true
|
||||||
memchr = "2.7.1"
|
memchr = "2.7.4"
|
||||||
cargo_metadata.workspace = true
|
cargo_metadata.workspace = true
|
||||||
process-wrap.workspace = true
|
process-wrap.workspace = true
|
||||||
|
|
||||||
|
|
@ -81,10 +81,10 @@ windows-sys = { version = "0.59", features = [
|
||||||
] }
|
] }
|
||||||
|
|
||||||
[target.'cfg(not(target_env = "msvc"))'.dependencies]
|
[target.'cfg(not(target_env = "msvc"))'.dependencies]
|
||||||
jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true }
|
jemallocator = { version = "0.5.4", package = "tikv-jemallocator", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
xshell.workspace = true
|
xshell.workspace = true
|
||||||
|
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ pub(crate) fn fetch_native_diagnostics(
|
||||||
for (file_id, group) in odd_ones
|
for (file_id, group) in odd_ones
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.sorted_by_key(|it| it.range.file_id)
|
.sorted_by_key(|it| it.range.file_id)
|
||||||
.group_by(|it| it.range.file_id)
|
.chunk_by(|it| it.range.file_id)
|
||||||
.into_iter()
|
.into_iter()
|
||||||
{
|
{
|
||||||
if !subscriptions.contains(&file_id) {
|
if !subscriptions.contains(&file_id) {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
backtrace = { version = "0.3.67", optional = true }
|
backtrace = { version = "0.3.74", optional = true }
|
||||||
jod-thread = "0.1.2"
|
jod-thread = "0.1.2"
|
||||||
crossbeam-channel.workspace = true
|
crossbeam-channel.workspace = true
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,8 @@ stdx.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rayon.workspace = true
|
rayon.workspace = true
|
||||||
expect-test = "1.4.0"
|
expect-test = "1.5.1"
|
||||||
rustc_apfloat = "0.2.0"
|
rustc_apfloat = "0.2.2"
|
||||||
|
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ rust-version.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
# Avoid adding deps here, this crate is widely used in tests it should compile fast!
|
# Avoid adding deps here, this crate is widely used in tests it should compile fast!
|
||||||
dissimilar = "1.0.7"
|
dissimilar = "1.0.10"
|
||||||
text-size.workspace = true
|
text-size.workspace = true
|
||||||
rustc-hash.workspace = true
|
rustc-hash.workspace = true
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ rust-version.workspace = true
|
||||||
[lib]
|
[lib]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
home = "0.5.4"
|
home = "0.5.11"
|
||||||
camino.workspace = true
|
camino.workspace = true
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ rust-version.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tracing.workspace = true
|
tracing.workspace = true
|
||||||
walkdir = "2.3.2"
|
walkdir = "2.5.0"
|
||||||
crossbeam-channel.workspace = true
|
crossbeam-channel.workspace = true
|
||||||
notify = "8.0.0"
|
notify = "8.0.0"
|
||||||
rayon = "1.10.0"
|
rayon = "1.10.0"
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ text-size = "1.1.1"
|
||||||
nohash-hasher = "0.2.0"
|
nohash-hasher = "0.2.0"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
oorandom = "11.1.3"
|
oorandom = "11.1.5"
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|
|
||||||
|
|
@ -7,15 +7,15 @@ repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-ser
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
log = "0.4.17"
|
log = "0.4.26"
|
||||||
serde_json = "1.0.108"
|
serde_json = "1.0.140"
|
||||||
serde = { version = "1.0.216" }
|
serde = { version = "1.0.219" }
|
||||||
serde_derive = { version = "1.0.216" }
|
serde_derive = { version = "1.0.219" }
|
||||||
crossbeam-channel.workspace = true
|
crossbeam-channel.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
lsp-types = "=0.95"
|
lsp-types = "=0.95"
|
||||||
ctrlc = "3.4.1"
|
ctrlc = "3.4.5"
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|
|
||||||
|
|
@ -8,16 +8,16 @@ rust-version.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
directories = "5.0"
|
directories = "6.0"
|
||||||
flate2 = "1.0.24"
|
flate2 = "1.1.0"
|
||||||
write-json = "0.1.2"
|
write-json = "0.1.4"
|
||||||
xshell.workspace = true
|
xshell.workspace = true
|
||||||
xflags = "0.3.0"
|
xflags = "0.3.2"
|
||||||
time = { version = "0.3", default-features = false }
|
time = { version = "0.3", default-features = false }
|
||||||
zip = { version = "0.6", default-features = false, features = ["deflate", "time"] }
|
zip = { version = "2.4", default-features = false, features = ["deflate-flate2", "flate2", "time"] }
|
||||||
stdx.workspace = true
|
stdx.workspace = true
|
||||||
proc-macro2 = "1.0.93"
|
proc-macro2 = "1.0.94"
|
||||||
quote = "1.0.20"
|
quote = "1.0.40"
|
||||||
ungrammar = "1.16.1"
|
ungrammar = "1.16.1"
|
||||||
either.workspace = true
|
either.workspace = true
|
||||||
itertools.workspace = true
|
itertools.workspace = true
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ use std::{
|
||||||
use flate2::{Compression, write::GzEncoder};
|
use flate2::{Compression, write::GzEncoder};
|
||||||
use time::OffsetDateTime;
|
use time::OffsetDateTime;
|
||||||
use xshell::{Shell, cmd};
|
use xshell::{Shell, cmd};
|
||||||
use zip::{DateTime, ZipWriter, write::FileOptions};
|
use zip::{DateTime, ZipWriter, write::SimpleFileOptions};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
date_iso,
|
date_iso,
|
||||||
|
|
@ -125,7 +125,7 @@ fn zip(src_path: &Path, symbols_path: Option<&PathBuf>, dest_path: &Path) -> any
|
||||||
let mut writer = ZipWriter::new(BufWriter::new(file));
|
let mut writer = ZipWriter::new(BufWriter::new(file));
|
||||||
writer.start_file(
|
writer.start_file(
|
||||||
src_path.file_name().unwrap().to_str().unwrap(),
|
src_path.file_name().unwrap().to_str().unwrap(),
|
||||||
FileOptions::default()
|
SimpleFileOptions::default()
|
||||||
.last_modified_time(
|
.last_modified_time(
|
||||||
DateTime::try_from(OffsetDateTime::from(std::fs::metadata(src_path)?.modified()?))
|
DateTime::try_from(OffsetDateTime::from(std::fs::metadata(src_path)?.modified()?))
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
|
|
@ -139,7 +139,7 @@ fn zip(src_path: &Path, symbols_path: Option<&PathBuf>, dest_path: &Path) -> any
|
||||||
if let Some(symbols_path) = symbols_path {
|
if let Some(symbols_path) = symbols_path {
|
||||||
writer.start_file(
|
writer.start_file(
|
||||||
symbols_path.file_name().unwrap().to_str().unwrap(),
|
symbols_path.file_name().unwrap().to_str().unwrap(),
|
||||||
FileOptions::default()
|
SimpleFileOptions::default()
|
||||||
.last_modified_time(
|
.last_modified_time(
|
||||||
DateTime::try_from(OffsetDateTime::from(
|
DateTime::try_from(OffsetDateTime::from(
|
||||||
std::fs::metadata(src_path)?.modified()?,
|
std::fs::metadata(src_path)?.modified()?,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue