Skip to content

Commit 5528b96

Browse files
authored
Merge pull request rust-lang#19367 from Veykril/push-ryowkxkntnpo
chore: Drop legacy salsa
2 parents cbd6265 + 94e0b32 commit 5528b96

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+9
-10115
lines changed

src/tools/rust-analyzer/Cargo.lock

Lines changed: 8 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ dependencies = [
8888
"lz4_flex",
8989
"query-group-macro",
9090
"rustc-hash 2.1.1",
91-
"salsa 0.19.0",
91+
"salsa",
9292
"semver",
9393
"span",
9494
"stdx",
@@ -656,7 +656,7 @@ dependencies = [
656656
"ra-ap-rustc_parse_format",
657657
"rustc-hash 2.1.1",
658658
"rustc_apfloat",
659-
"salsa 0.19.0",
659+
"salsa",
660660
"smallvec",
661661
"span",
662662
"stdx",
@@ -687,7 +687,7 @@ dependencies = [
687687
"parser",
688688
"query-group-macro",
689689
"rustc-hash 2.1.1",
690-
"salsa 0.19.0",
690+
"salsa",
691691
"smallvec",
692692
"span",
693693
"stdx",
@@ -729,7 +729,7 @@ dependencies = [
729729
"ra-ap-rustc_pattern_analysis",
730730
"rustc-hash 2.1.1",
731731
"rustc_apfloat",
732-
"salsa 0.19.0",
732+
"salsa",
733733
"scoped-tls",
734734
"smallvec",
735735
"span",
@@ -966,7 +966,7 @@ dependencies = [
966966
"query-group-macro",
967967
"rayon",
968968
"rustc-hash 2.1.1",
969-
"salsa 0.19.0",
969+
"salsa",
970970
"span",
971971
"stdx",
972972
"syntax",
@@ -1190,12 +1190,6 @@ dependencies = [
11901190
"text-size",
11911191
]
11921192

1193-
[[package]]
1194-
name = "linked-hash-map"
1195-
version = "0.5.6"
1196-
source = "registry+https://github.com/rust-lang/crates.io-index"
1197-
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
1198-
11991193
[[package]]
12001194
name = "litemap"
12011195
version = "0.7.5"
@@ -1619,15 +1613,6 @@ version = "0.2.0"
16191613
source = "registry+https://github.com/rust-lang/crates.io-index"
16201614
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
16211615

1622-
[[package]]
1623-
name = "ppv-lite86"
1624-
version = "0.2.21"
1625-
source = "registry+https://github.com/rust-lang/crates.io-index"
1626-
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
1627-
dependencies = [
1628-
"zerocopy",
1629-
]
1630-
16311616
[[package]]
16321617
name = "proc-macro-api"
16331618
version = "0.0.0"
@@ -1785,7 +1770,7 @@ dependencies = [
17851770
"heck",
17861771
"proc-macro2",
17871772
"quote",
1788-
"salsa 0.19.0",
1773+
"salsa",
17891774
"syn",
17901775
]
17911776

@@ -1874,36 +1859,6 @@ dependencies = [
18741859
"tracing",
18751860
]
18761861

1877-
[[package]]
1878-
name = "rand"
1879-
version = "0.8.5"
1880-
source = "registry+https://github.com/rust-lang/crates.io-index"
1881-
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
1882-
dependencies = [
1883-
"libc",
1884-
"rand_chacha",
1885-
"rand_core",
1886-
]
1887-
1888-
[[package]]
1889-
name = "rand_chacha"
1890-
version = "0.3.1"
1891-
source = "registry+https://github.com/rust-lang/crates.io-index"
1892-
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
1893-
dependencies = [
1894-
"ppv-lite86",
1895-
"rand_core",
1896-
]
1897-
1898-
[[package]]
1899-
name = "rand_core"
1900-
version = "0.6.4"
1901-
source = "registry+https://github.com/rust-lang/crates.io-index"
1902-
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
1903-
dependencies = [
1904-
"getrandom",
1905-
]
1906-
19071862
[[package]]
19081863
name = "rayon"
19091864
version = "1.10.0"
@@ -2113,26 +2068,6 @@ version = "1.0.20"
21132068
source = "registry+https://github.com/rust-lang/crates.io-index"
21142069
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
21152070

2116-
[[package]]
2117-
name = "salsa"
2118-
version = "0.0.0"
2119-
dependencies = [
2120-
"dissimilar",
2121-
"expect-test",
2122-
"indexmap",
2123-
"itertools",
2124-
"linked-hash-map",
2125-
"lock_api",
2126-
"oorandom",
2127-
"parking_lot",
2128-
"rand",
2129-
"rustc-hash 2.1.1",
2130-
"salsa-macros 0.0.0",
2131-
"smallvec",
2132-
"tracing",
2133-
"triomphe",
2134-
]
2135-
21362071
[[package]]
21372072
name = "salsa"
21382073
version = "0.19.0"
@@ -2150,7 +2085,7 @@ dependencies = [
21502085
"rayon",
21512086
"rustc-hash 2.1.1",
21522087
"salsa-macro-rules",
2153-
"salsa-macros 0.19.0",
2088+
"salsa-macros",
21542089
"smallvec",
21552090
"tracing",
21562091
]
@@ -2161,16 +2096,6 @@ version = "0.19.0"
21612096
source = "registry+https://github.com/rust-lang/crates.io-index"
21622097
checksum = "2619b4b451beab0a7e4364ff1e6f31950e7e418888fd9bf2f28889671563166a"
21632098

2164-
[[package]]
2165-
name = "salsa-macros"
2166-
version = "0.0.0"
2167-
dependencies = [
2168-
"heck",
2169-
"proc-macro2",
2170-
"quote",
2171-
"syn",
2172-
]
2173-
21742099
[[package]]
21752100
name = "salsa-macros"
21762101
version = "0.19.0"
@@ -2314,7 +2239,7 @@ dependencies = [
23142239
"hashbrown 0.14.5",
23152240
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
23162241
"rustc-hash 2.1.1",
2317-
"salsa 0.19.0",
2242+
"salsa",
23182243
"stdx",
23192244
"syntax",
23202245
"text-size",
@@ -3267,26 +3192,6 @@ dependencies = [
32673192
"synstructure",
32683193
]
32693194

3270-
[[package]]
3271-
name = "zerocopy"
3272-
version = "0.8.23"
3273-
source = "registry+https://github.com/rust-lang/crates.io-index"
3274-
checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
3275-
dependencies = [
3276-
"zerocopy-derive",
3277-
]
3278-
3279-
[[package]]
3280-
name = "zerocopy-derive"
3281-
version = "0.8.23"
3282-
source = "registry+https://github.com/rust-lang/crates.io-index"
3283-
checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
3284-
dependencies = [
3285-
"proc-macro2",
3286-
"quote",
3287-
"syn",
3288-
]
3289-
32903195
[[package]]
32913196
name = "zerofrom"
32923197
version = "0.1.6"

src/tools/rust-analyzer/crates/ra-salsa/Cargo.toml

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/tools/rust-analyzer/crates/ra-salsa/FAQ.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)