Skip to content

Commit a91f7d7

Browse files
borsbors
committed
Auto merge of #127617 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer` r? `@ghost`
2 parents 5572759 + 3e73272 commit a91f7d7

File tree

275 files changed

+7370
-4431
lines changed

Some content is hidden

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

275 files changed

+7370
-4431
lines changed

‎src/tools/rust-analyzer/.github/workflows/release.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
133133

134134
- name: Upload artifacts
135-
uses: actions/upload-artifact@v1
135+
uses: actions/upload-artifact@v4
136136
with:
137137
name: dist-${{ matrix.target }}
138138
path: ./dist
@@ -177,7 +177,7 @@ jobs:
177177
- run: rm -rf editors/code/server
178178

179179
- name: Upload artifacts
180-
uses: actions/upload-artifact@v1
180+
uses: actions/upload-artifact@v4
181181
with:
182182
name: dist-x86_64-unknown-linux-musl
183183
path: ./dist
@@ -206,39 +206,39 @@ jobs:
206206
- run: echo "HEAD_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
207207
- run: 'echo "HEAD_SHA: $HEAD_SHA"'
208208

209-
- uses: actions/download-artifact@v1
209+
- uses: actions/download-artifact@v4
210210
with:
211211
name: dist-aarch64-apple-darwin
212212
path: dist
213-
- uses: actions/download-artifact@v1
213+
- uses: actions/download-artifact@v4
214214
with:
215215
name: dist-x86_64-apple-darwin
216216
path: dist
217-
- uses: actions/download-artifact@v1
217+
- uses: actions/download-artifact@v4
218218
with:
219219
name: dist-x86_64-unknown-linux-gnu
220220
path: dist
221-
- uses: actions/download-artifact@v1
221+
- uses: actions/download-artifact@v4
222222
with:
223223
name: dist-x86_64-unknown-linux-musl
224224
path: dist
225-
- uses: actions/download-artifact@v1
225+
- uses: actions/download-artifact@v4
226226
with:
227227
name: dist-aarch64-unknown-linux-gnu
228228
path: dist
229-
- uses: actions/download-artifact@v1
229+
- uses: actions/download-artifact@v4
230230
with:
231231
name: dist-arm-unknown-linux-gnueabihf
232232
path: dist
233-
- uses: actions/download-artifact@v1
233+
- uses: actions/download-artifact@v4
234234
with:
235235
name: dist-x86_64-pc-windows-msvc
236236
path: dist
237-
- uses: actions/download-artifact@v1
237+
- uses: actions/download-artifact@v4
238238
with:
239239
name: dist-i686-pc-windows-msvc
240240
path: dist
241-
- uses: actions/download-artifact@v1
241+
- uses: actions/download-artifact@v4
242242
with:
243243
name: dist-aarch64-pc-windows-msvc
244244
path: dist

‎src/tools/rust-analyzer/Cargo.lock‎

Lines changed: 22 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
167167

168168
[[package]]
169169
name = "chalk-derive"
170-
version = "0.97.0"
170+
version = "0.98.0"
171171
source = "registry+https://github.com/rust-lang/crates.io-index"
172-
checksum = "92a0aedc4ac2adc5c0b7dc9ec38c5c816284ad28da6d4ecd01873b9683f54972"
172+
checksum = "9426c8fd0fe61c3da880b801d3b510524df17843a8f9ec1f5b9cec24fb7412df"
173173
dependencies = [
174174
"proc-macro2",
175175
"quote",
@@ -179,19 +179,19 @@ dependencies = [
179179

180180
[[package]]
181181
name = "chalk-ir"
182-
version = "0.97.0"
182+
version = "0.98.0"
183183
source = "registry+https://github.com/rust-lang/crates.io-index"
184-
checksum = "db18493569b190f7266a04901e520fc3a5c00564475154287906f8a27302c119"
184+
checksum = "d5f2eb1cd6054da221bd1ac0197fb2fe5e2caf3dcb93619398fc1433f8f09093"
185185
dependencies = [
186186
"bitflags 2.5.0",
187187
"chalk-derive",
188188
]
189189

190190
[[package]]
191191
name = "chalk-recursive"
192-
version = "0.97.0"
192+
version = "0.98.0"
193193
source = "registry+https://github.com/rust-lang/crates.io-index"
194-
checksum = "ae4ba8ce5bd2e1b59f1f79495bc8704db09a8285e51cc5ddf01d9baee1bf447d"
194+
checksum = "129dc03458f71cfb9c3cd621c9c68166a94e87b85b16ccd29af015d7ff9a1c61"
195195
dependencies = [
196196
"chalk-derive",
197197
"chalk-ir",
@@ -202,9 +202,9 @@ dependencies = [
202202

203203
[[package]]
204204
name = "chalk-solve"
205-
version = "0.97.0"
205+
version = "0.98.0"
206206
source = "registry+https://github.com/rust-lang/crates.io-index"
207-
checksum = "b2ec1b3b7f7b1ec38f099ef39c2bc3ea29335be1b8316d114baff46d96d131e9"
207+
checksum = "d7e8a8c1e928f98cdf227b868416ef21dcd8cc3c61b347576d783713444d41c8"
208208
dependencies = [
209209
"chalk-derive",
210210
"chalk-ir",
@@ -221,11 +221,6 @@ name = "countme"
221221
version = "3.0.1"
222222
source = "registry+https://github.com/rust-lang/crates.io-index"
223223
checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
224-
dependencies = [
225-
"dashmap",
226-
"once_cell",
227-
"rustc-hash",
228-
]
229224

230225
[[package]]
231226
name = "cov-mark"
@@ -548,10 +543,10 @@ dependencies = [
548543
"limit",
549544
"mbe",
550545
"once_cell",
551-
"profile",
552546
"ra-ap-rustc_abi",
553547
"ra-ap-rustc_parse_format",
554548
"rustc-hash",
549+
"rustc_apfloat",
555550
"smallvec",
556551
"span",
557552
"stdx",
@@ -616,9 +611,10 @@ dependencies = [
616611
"oorandom",
617612
"project-model",
618613
"ra-ap-rustc_abi",
619-
"ra-ap-rustc_index 0.53.0",
614+
"ra-ap-rustc_index",
620615
"ra-ap-rustc_pattern_analysis",
621616
"rustc-hash",
617+
"rustc_apfloat",
622618
"scoped-tls",
623619
"smallvec",
624620
"span",
@@ -664,6 +660,7 @@ dependencies = [
664660
"profile",
665661
"pulldown-cmark",
666662
"pulldown-cmark-to-cmark",
663+
"rustc_apfloat",
667664
"smallvec",
668665
"span",
669666
"stdx",
@@ -809,7 +806,6 @@ checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
809806
dependencies = [
810807
"equivalent",
811808
"hashbrown",
812-
"serde",
813809
]
814810

815811
[[package]]
@@ -1046,6 +1042,7 @@ checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
10461042
name = "mbe"
10471043
version = "0.0.0"
10481044
dependencies = [
1045+
"arrayvec",
10491046
"cov-mark",
10501047
"parser",
10511048
"rustc-hash",
@@ -1250,7 +1247,6 @@ dependencies = [
12501247
"expect-test",
12511248
"limit",
12521249
"ra-ap-rustc_lexer",
1253-
"sourcegen",
12541250
"stdx",
12551251
"tracing",
12561252
]
@@ -1328,18 +1324,14 @@ dependencies = [
13281324
"base-db",
13291325
"indexmap",
13301326
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1331-
"memmap2",
1332-
"object 0.33.0",
13331327
"paths",
13341328
"rustc-hash",
13351329
"serde",
13361330
"serde_json",
1337-
"snap",
13381331
"span",
13391332
"stdx",
13401333
"text-size",
13411334
"tracing",
1342-
"triomphe",
13431335
"tt",
13441336
]
13451337

@@ -1357,6 +1349,7 @@ dependencies = [
13571349
"proc-macro-api",
13581350
"proc-macro-test",
13591351
"ra-ap-rustc_lexer",
1352+
"snap",
13601353
"span",
13611354
"stdx",
13621355
"tt",
@@ -1403,13 +1396,9 @@ name = "profile"
14031396
version = "0.0.0"
14041397
dependencies = [
14051398
"cfg-if",
1406-
"countme",
1407-
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
14081399
"libc",
1409-
"once_cell",
14101400
"perf-event",
14111401
"tikv-jemalloc-ctl",
1412-
"tracing",
14131402
"windows-sys 0.52.0",
14141403
]
14151404

@@ -1492,44 +1481,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
14921481
checksum = "80b1d613eee933486c0613a7bc26e515e46f43adf479d1edd5e537f983e9ce46"
14931482
dependencies = [
14941483
"bitflags 2.5.0",
1495-
"ra-ap-rustc_index 0.53.0",
1484+
"ra-ap-rustc_index",
14961485
"tracing",
14971486
]
14981487

1499-
[[package]]
1500-
name = "ra-ap-rustc_index"
1501-
version = "0.44.0"
1502-
source = "registry+https://github.com/rust-lang/crates.io-index"
1503-
checksum = "9ad68bacffb87dcdbb23a3ce11261375078aaa06b85d348c49f39ffd5510dc20"
1504-
dependencies = [
1505-
"arrayvec",
1506-
"ra-ap-rustc_index_macros 0.44.0",
1507-
"smallvec",
1508-
]
1509-
15101488
[[package]]
15111489
name = "ra-ap-rustc_index"
15121490
version = "0.53.0"
15131491
source = "registry+https://github.com/rust-lang/crates.io-index"
15141492
checksum = "f072060ac77e9e1a02cc20028095993af7e72cc0804779c68bcbf47b16de49c9"
15151493
dependencies = [
15161494
"arrayvec",
1517-
"ra-ap-rustc_index_macros 0.53.0",
1495+
"ra-ap-rustc_index_macros",
15181496
"smallvec",
15191497
]
15201498

1521-
[[package]]
1522-
name = "ra-ap-rustc_index_macros"
1523-
version = "0.44.0"
1524-
source = "registry+https://github.com/rust-lang/crates.io-index"
1525-
checksum = "8782aaf3a113837c533dfb1c45df91cd17e1fdd1d2f9a20c2e0d1976025c4f1f"
1526-
dependencies = [
1527-
"proc-macro2",
1528-
"quote",
1529-
"syn",
1530-
"synstructure",
1531-
]
1532-
15331499
[[package]]
15341500
name = "ra-ap-rustc_index_macros"
15351501
version = "0.53.0"
@@ -1558,17 +1524,17 @@ version = "0.53.0"
15581524
source = "registry+https://github.com/rust-lang/crates.io-index"
15591525
checksum = "70dad7a491c2554590222e0c9212dcb7c2e7aceb668875075012a35ea780d135"
15601526
dependencies = [
1561-
"ra-ap-rustc_index 0.53.0",
1527+
"ra-ap-rustc_index",
15621528
"ra-ap-rustc_lexer",
15631529
]
15641530

15651531
[[package]]
15661532
name = "ra-ap-rustc_pattern_analysis"
1567-
version = "0.44.0"
1533+
version = "0.53.0"
15681534
source = "registry+https://github.com/rust-lang/crates.io-index"
1569-
checksum = "d63d1e1d5b2a13273cee1a10011147418f40e12b70f70578ce1dee0f1cafc334"
1535+
checksum = "34768e1faf88c31f2e9ad57b48318a52b507dafac0cddbf01b5d63bfc0b0a365"
15701536
dependencies = [
1571-
"ra-ap-rustc_index 0.44.0",
1537+
"ra-ap-rustc_index",
15721538
"rustc-hash",
15731539
"rustc_apfloat",
15741540
"smallvec",
@@ -1685,7 +1651,6 @@ dependencies = [
16851651
"ide",
16861652
"ide-db",
16871653
"ide-ssr",
1688-
"indexmap",
16891654
"itertools",
16901655
"load-cargo",
16911656
"lsp-server 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1708,7 +1673,6 @@ dependencies = [
17081673
"semver",
17091674
"serde",
17101675
"serde_json",
1711-
"sourcegen",
17121676
"stdx",
17131677
"syntax",
17141678
"test-fixture",
@@ -1907,13 +1871,6 @@ version = "1.1.1"
19071871
source = "registry+https://github.com/rust-lang/crates.io-index"
19081872
checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
19091873

1910-
[[package]]
1911-
name = "sourcegen"
1912-
version = "0.0.0"
1913-
dependencies = [
1914-
"xshell",
1915-
]
1916-
19171874
[[package]]
19181875
name = "span"
19191876
version = "0.0.0"
@@ -1985,6 +1942,7 @@ dependencies = [
19851942
"rayon",
19861943
"rowan",
19871944
"rustc-hash",
1945+
"rustc_apfloat",
19881946
"smol_str",
19891947
"stdx",
19901948
"test-utils",
@@ -2251,6 +2209,7 @@ dependencies = [
22512209
name = "tt"
22522210
version = "0.0.0"
22532211
dependencies = [
2212+
"arrayvec",
22542213
"smol_str",
22552214
"stdx",
22562215
"text-size",

0 commit comments

Comments
 (0)