Skip to content

Commit 5a65a24

Browse files
authored
Rollup merge of rust-lang#146749 - lnicola:sync-from-ra, r=lnicola
`rust-analyzer` subtree update Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@50bb3c5. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
2 parents 5e52bf9 + fefecbc commit 5a65a24

File tree

359 files changed

+38593
-9169
lines changed

Some content is hidden

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

359 files changed

+38593
-9169
lines changed

src/tools/rust-analyzer/Cargo.lock

Lines changed: 105 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
259259

260260
[[package]]
261261
name = "chalk-derive"
262-
version = "0.103.0"
262+
version = "0.104.0"
263263
source = "registry+https://github.com/rust-lang/crates.io-index"
264-
checksum = "eb4899682de915ca7c0b025bdd0a3d34c75fe12184122fda6805a7baddaa293c"
264+
checksum = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa"
265265
dependencies = [
266266
"proc-macro2",
267267
"quote",
@@ -271,19 +271,19 @@ dependencies = [
271271

272272
[[package]]
273273
name = "chalk-ir"
274-
version = "0.103.0"
274+
version = "0.104.0"
275275
source = "registry+https://github.com/rust-lang/crates.io-index"
276-
checksum = "90a37d2ab99352b4caca135061e7b4ac67024b648c28ed0b787feec4bea4caed"
276+
checksum = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8"
277277
dependencies = [
278278
"bitflags 2.9.1",
279279
"chalk-derive",
280280
]
281281

282282
[[package]]
283283
name = "chalk-recursive"
284-
version = "0.103.0"
284+
version = "0.104.0"
285285
source = "registry+https://github.com/rust-lang/crates.io-index"
286-
checksum = "c855be60e646664bc37c2496d3dc81ca5ef60520930e5e0f0057a0575aff6c19"
286+
checksum = "882959c242558cc686de7ff0aa59860295598d119e84a4b100215f44c3d606c4"
287287
dependencies = [
288288
"chalk-derive",
289289
"chalk-ir",
@@ -294,9 +294,9 @@ dependencies = [
294294

295295
[[package]]
296296
name = "chalk-solve"
297-
version = "0.103.0"
297+
version = "0.104.0"
298298
source = "registry+https://github.com/rust-lang/crates.io-index"
299-
checksum = "477ac6cdfd2013e9f93b09b036c2b607a67b2e728f4777b8422d55a79e9e3a34"
299+
checksum = "72860086494ccfa05bbd3779a74babb8ace27da9a0cbabffa1315223c7290927"
300300
dependencies = [
301301
"chalk-derive",
302302
"chalk-ir",
@@ -445,6 +445,17 @@ dependencies = [
445445
"powerfmt",
446446
]
447447

448+
[[package]]
449+
name = "derive-where"
450+
version = "1.5.0"
451+
source = "registry+https://github.com/rust-lang/crates.io-index"
452+
checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b"
453+
dependencies = [
454+
"proc-macro2",
455+
"quote",
456+
"syn",
457+
]
458+
448459
[[package]]
449460
name = "derive_arbitrary"
450461
version = "1.4.1"
@@ -696,6 +707,7 @@ dependencies = [
696707
"indexmap",
697708
"intern",
698709
"itertools 0.14.0",
710+
"ra-ap-rustc_type_ir",
699711
"rustc-hash 2.1.1",
700712
"smallvec",
701713
"span",
@@ -705,6 +717,8 @@ dependencies = [
705717
"test-fixture",
706718
"test-utils",
707719
"tracing",
720+
"tracing-subscriber",
721+
"tracing-tree",
708722
"triomphe",
709723
"tt",
710724
]
@@ -801,8 +815,11 @@ dependencies = [
801815
"project-model",
802816
"query-group-macro",
803817
"ra-ap-rustc_abi",
818+
"ra-ap-rustc_ast_ir",
804819
"ra-ap-rustc_index",
820+
"ra-ap-rustc_next_trait_solver",
805821
"ra-ap-rustc_pattern_analysis",
822+
"ra-ap-rustc_type_ir",
806823
"rustc-hash 2.1.1",
807824
"rustc_apfloat",
808825
"salsa",
@@ -1294,7 +1311,7 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
12941311

12951312
[[package]]
12961313
name = "lsp-server"
1297-
version = "0.7.8"
1314+
version = "0.7.9"
12981315
dependencies = [
12991316
"anyhow",
13001317
"crossbeam-channel",
@@ -1310,9 +1327,9 @@ dependencies = [
13101327

13111328
[[package]]
13121329
name = "lsp-server"
1313-
version = "0.7.8"
1330+
version = "0.7.9"
13141331
source = "registry+https://github.com/rust-lang/crates.io-index"
1315-
checksum = "9462c4dc73e17f971ec1f171d44bfffb72e65a130117233388a0ebc7ec5656f9"
1332+
checksum = "7d6ada348dbc2703cbe7637b2dda05cff84d3da2819c24abcb305dd613e0ba2e"
13161333
dependencies = [
13171334
"crossbeam-channel",
13181335
"log",
@@ -1343,7 +1360,7 @@ dependencies = [
13431360
"expect-test",
13441361
"intern",
13451362
"parser",
1346-
"ra-ap-rustc_lexer 0.123.0",
1363+
"ra-ap-rustc_lexer",
13471364
"rustc-hash 2.1.1",
13481365
"smallvec",
13491366
"span",
@@ -1579,8 +1596,8 @@ dependencies = [
15791596
"drop_bomb",
15801597
"edition",
15811598
"expect-test",
1582-
"ra-ap-rustc_lexer 0.123.0",
1583-
"rustc-literal-escaper",
1599+
"ra-ap-rustc_lexer",
1600+
"rustc-literal-escaper 0.0.4",
15841601
"stdx",
15851602
"tracing",
15861603
]
@@ -1700,7 +1717,7 @@ dependencies = [
17001717
"object",
17011718
"paths",
17021719
"proc-macro-test",
1703-
"ra-ap-rustc_lexer 0.123.0",
1720+
"ra-ap-rustc_lexer",
17041721
"span",
17051722
"syntax-bridge",
17061723
"temp-dir",
@@ -1846,40 +1863,46 @@ dependencies = [
18461863

18471864
[[package]]
18481865
name = "ra-ap-rustc_abi"
1849-
version = "0.123.0"
1866+
version = "0.131.0"
18501867
source = "registry+https://github.com/rust-lang/crates.io-index"
1851-
checksum = "f18c877575c259d127072e9bfc41d985202262fb4d6bfdae3d1252147c2562c2"
1868+
checksum = "016c05852e89655395fbf7d5e729e31cd58b2690480b3a8468eb2b38c91f3756"
18521869
dependencies = [
18531870
"bitflags 2.9.1",
18541871
"ra-ap-rustc_hashes",
18551872
"ra-ap-rustc_index",
18561873
"tracing",
18571874
]
18581875

1876+
[[package]]
1877+
name = "ra-ap-rustc_ast_ir"
1878+
version = "0.131.0"
1879+
source = "registry+https://github.com/rust-lang/crates.io-index"
1880+
checksum = "c5bff48bd0a26f17a4e2e8610bc393296c3d002e221f5c6c4d2875e6a64a3b4b"
1881+
18591882
[[package]]
18601883
name = "ra-ap-rustc_hashes"
1861-
version = "0.123.0"
1884+
version = "0.131.0"
18621885
source = "registry+https://github.com/rust-lang/crates.io-index"
1863-
checksum = "2439ed1df3472443133b66949f81080dff88089b42f825761455463709ee1cad"
1886+
checksum = "5d15e7571f6f31f6112fd2fcbc3450a6ef477cc6bfe51643a2b110436a7455f0"
18641887
dependencies = [
18651888
"rustc-stable-hash",
18661889
]
18671890

18681891
[[package]]
18691892
name = "ra-ap-rustc_index"
1870-
version = "0.123.0"
1893+
version = "0.131.0"
18711894
source = "registry+https://github.com/rust-lang/crates.io-index"
1872-
checksum = "57a24fe0be21be1f8ebc21dcb40129214fb4cefb0f2753f3d46b6dbe656a1a45"
1895+
checksum = "60a30f0a15682f1194e5812cc3544266f3494ca8fb3c5033e8b9c08f4f8b8c6d"
18731896
dependencies = [
18741897
"ra-ap-rustc_index_macros",
18751898
"smallvec",
18761899
]
18771900

18781901
[[package]]
18791902
name = "ra-ap-rustc_index_macros"
1880-
version = "0.123.0"
1903+
version = "0.131.0"
18811904
source = "registry+https://github.com/rust-lang/crates.io-index"
1882-
checksum = "844a27ddcad0116facae2df8e741fd788662cf93dc13029cd864f2b8013b81f9"
1905+
checksum = "e2f82c9176b964591e1657a9f0fae2850525542d39075c49c2459afc291f4804"
18831906
dependencies = [
18841907
"proc-macro2",
18851908
"quote",
@@ -1888,41 +1911,43 @@ dependencies = [
18881911

18891912
[[package]]
18901913
name = "ra-ap-rustc_lexer"
1891-
version = "0.121.0"
1914+
version = "0.131.0"
18921915
source = "registry+https://github.com/rust-lang/crates.io-index"
1893-
checksum = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36"
1916+
checksum = "585c71ff7da5ca1e8a0c65d5e7cec7ab2a7e9e45b6859543bd2d0be21bee631c"
18941917
dependencies = [
18951918
"memchr",
18961919
"unicode-properties",
18971920
"unicode-xid",
18981921
]
18991922

19001923
[[package]]
1901-
name = "ra-ap-rustc_lexer"
1902-
version = "0.123.0"
1924+
name = "ra-ap-rustc_next_trait_solver"
1925+
version = "0.131.0"
19031926
source = "registry+https://github.com/rust-lang/crates.io-index"
1904-
checksum = "2b734cfcb577d09877799a22742f1bd398be6c00bc428d9de56d48d11ece5771"
1927+
checksum = "839f521a6cd97c71b2b6681604ace38a9c6737f7a223d072fa8f909879f9dc4b"
19051928
dependencies = [
1906-
"memchr",
1907-
"unicode-properties",
1908-
"unicode-xid",
1929+
"derive-where",
1930+
"ra-ap-rustc_index",
1931+
"ra-ap-rustc_type_ir",
1932+
"ra-ap-rustc_type_ir_macros",
1933+
"tracing",
19091934
]
19101935

19111936
[[package]]
19121937
name = "ra-ap-rustc_parse_format"
1913-
version = "0.121.0"
1938+
version = "0.131.0"
19141939
source = "registry+https://github.com/rust-lang/crates.io-index"
1915-
checksum = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97"
1940+
checksum = "83e7872a4fa0620937b60fc6270aa8c31864cb324357553e2be5b2bdc25fa89a"
19161941
dependencies = [
1917-
"ra-ap-rustc_lexer 0.121.0",
1918-
"rustc-literal-escaper",
1942+
"ra-ap-rustc_lexer",
1943+
"rustc-literal-escaper 0.0.5",
19191944
]
19201945

19211946
[[package]]
19221947
name = "ra-ap-rustc_pattern_analysis"
1923-
version = "0.123.0"
1948+
version = "0.131.0"
19241949
source = "registry+https://github.com/rust-lang/crates.io-index"
1925-
checksum = "75b0ee1f059b9dea0818c6c7267478926eee95ba4c7dcf89c8db32fa165d3904"
1950+
checksum = "4ecd7f9b960c8cf1e9d02a25297f52a520134132164cfedd3e69fee4f294d41c"
19261951
dependencies = [
19271952
"ra-ap-rustc_index",
19281953
"rustc-hash 2.1.1",
@@ -1931,6 +1956,38 @@ dependencies = [
19311956
"tracing",
19321957
]
19331958

1959+
[[package]]
1960+
name = "ra-ap-rustc_type_ir"
1961+
version = "0.131.0"
1962+
source = "registry+https://github.com/rust-lang/crates.io-index"
1963+
checksum = "9494498f8f7c57a5b4ea4e35a6c554cca8d5323adb534d13dc6cd117a7e00e4d"
1964+
dependencies = [
1965+
"arrayvec",
1966+
"bitflags 2.9.1",
1967+
"derive-where",
1968+
"ena",
1969+
"indexmap",
1970+
"ra-ap-rustc_ast_ir",
1971+
"ra-ap-rustc_index",
1972+
"ra-ap-rustc_type_ir_macros",
1973+
"rustc-hash 2.1.1",
1974+
"smallvec",
1975+
"thin-vec",
1976+
"tracing",
1977+
]
1978+
1979+
[[package]]
1980+
name = "ra-ap-rustc_type_ir_macros"
1981+
version = "0.131.0"
1982+
source = "registry+https://github.com/rust-lang/crates.io-index"
1983+
checksum = "28ed893760b86529080af59438c28dfa9ca976b821cfd0a3b0eb9591932847e6"
1984+
dependencies = [
1985+
"proc-macro2",
1986+
"quote",
1987+
"syn",
1988+
"synstructure",
1989+
]
1990+
19341991
[[package]]
19351992
name = "rayon"
19361993
version = "1.10.0"
@@ -2007,7 +2064,7 @@ dependencies = [
20072064
"intern",
20082065
"itertools 0.14.0",
20092066
"load-cargo",
2010-
"lsp-server 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
2067+
"lsp-server 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
20112068
"lsp-types",
20122069
"memchr",
20132070
"mimalloc",
@@ -2073,6 +2130,12 @@ version = "0.0.4"
20732130
source = "registry+https://github.com/rust-lang/crates.io-index"
20742131
checksum = "ab03008eb631b703dd16978282ae36c73282e7922fe101a4bd072a40ecea7b8b"
20752132

2133+
[[package]]
2134+
name = "rustc-literal-escaper"
2135+
version = "0.0.5"
2136+
source = "registry+https://github.com/rust-lang/crates.io-index"
2137+
checksum = "e4ee29da77c5a54f42697493cd4c9b9f31b74df666a6c04dfc4fde77abe0438b"
2138+
20762139
[[package]]
20772140
name = "rustc-stable-hash"
20782141
version = "0.1.2"
@@ -2378,7 +2441,7 @@ dependencies = [
23782441
"rayon",
23792442
"rowan",
23802443
"rustc-hash 2.1.1",
2381-
"rustc-literal-escaper",
2444+
"rustc-literal-escaper 0.0.4",
23822445
"rustc_apfloat",
23832446
"smol_str",
23842447
"stdx",
@@ -2671,9 +2734,9 @@ dependencies = [
26712734

26722735
[[package]]
26732736
name = "tracing-subscriber"
2674-
version = "0.3.19"
2737+
version = "0.3.20"
26752738
source = "registry+https://github.com/rust-lang/crates.io-index"
2676-
checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
2739+
checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
26772740
dependencies = [
26782741
"sharded-slab",
26792742
"thread_local",
@@ -2706,7 +2769,7 @@ version = "0.0.0"
27062769
dependencies = [
27072770
"arrayvec",
27082771
"intern",
2709-
"ra-ap-rustc_lexer 0.123.0",
2772+
"ra-ap-rustc_lexer",
27102773
"stdx",
27112774
"text-size",
27122775
]

0 commit comments

Comments
 (0)