Skip to content

Commit 28174fc

Browse files
committed
Auto merge of #141278 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer` r? `@ghost`
2 parents f8e9e76 + 2147783 commit 28174fc

File tree

175 files changed

+3449
-1358
lines changed

Some content is hidden

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

175 files changed

+3449
-1358
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
contact_links:
2+
- name: Questions regarding rust-analyzer
3+
url: https://github.com/rust-lang/rust-analyzer/discussions
4+
about: Please ask and answer questions here instead of opening an issue

src/tools/rust-analyzer/.github/ISSUE_TEMPLATE/critical_nightly_regression.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ Troubleshooting guide: https://rust-analyzer.github.io/book/troubleshooting.html
1212
1313
Please try to provide information which will help us to fix the issue faster. Minimal reproducible examples with few dependencies are especially lovely <3.
1414
-->
15-
16-
This is a serious regression in nightly and it's important to fix it before the next release.

src/tools/rust-analyzer/.github/ISSUE_TEMPLATE/question.md

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

src/tools/rust-analyzer/.github/workflows/metrics.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
steps:
1919
- name: Install Rust toolchain
2020
run: |
21-
rustup update --no-self-update stable
22-
rustup default stable
23-
rustup component add --toolchain stable rust-src
21+
rustup update --no-self-update beta
22+
rustup default beta
23+
rustup component add --toolchain beta rust-src
2424
2525
- name: Checkout repository
2626
uses: actions/checkout@v4
@@ -61,9 +61,9 @@ jobs:
6161
steps:
6262
- name: Install Rust toolchain
6363
run: |
64-
rustup update --no-self-update stable
65-
rustup default stable
66-
rustup component add --toolchain stable rust-src
64+
rustup update --no-self-update beta
65+
rustup default beta
66+
rustup component add --toolchain beta rust-src
6767
6868
- name: Checkout repository
6969
uses: actions/checkout@v4

src/tools/rust-analyzer/Cargo.lock

Lines changed: 87 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
6161

6262
[[package]]
6363
name = "backtrace"
64-
version = "0.3.74"
64+
version = "0.3.75"
6565
source = "registry+https://github.com/rust-lang/crates.io-index"
66-
checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
66+
checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
6767
dependencies = [
6868
"addr2line",
6969
"cfg-if",
@@ -80,6 +80,7 @@ version = "0.0.0"
8080
dependencies = [
8181
"cfg",
8282
"dashmap",
83+
"indexmap",
8384
"intern",
8485
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
8586
"query-group-macro",
@@ -316,9 +317,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
316317

317318
[[package]]
318319
name = "ctrlc"
319-
version = "3.4.5"
320+
version = "3.4.7"
320321
source = "registry+https://github.com/rust-lang/crates.io-index"
321-
checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
322+
checksum = "46f93780a459b7d656ef7f071fe699c4d3d2cb201c4b24d085b6ddc505276e73"
322323
dependencies = [
323324
"nix",
324325
"windows-sys 0.59.0",
@@ -472,9 +473,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
472473

473474
[[package]]
474475
name = "flate2"
475-
version = "1.1.0"
476+
version = "1.1.1"
476477
source = "registry+https://github.com/rust-lang/crates.io-index"
477-
checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
478+
checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
478479
dependencies = [
479480
"crc32fast",
480481
"miniz_oxide",
@@ -1010,9 +1011,9 @@ dependencies = [
10101011

10111012
[[package]]
10121013
name = "indexmap"
1013-
version = "2.8.0"
1014+
version = "2.9.0"
10141015
source = "registry+https://github.com/rust-lang/crates.io-index"
1015-
checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
1016+
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
10161017
dependencies = [
10171018
"equivalent",
10181019
"hashbrown 0.15.2",
@@ -1123,12 +1124,12 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
11231124

11241125
[[package]]
11251126
name = "libloading"
1126-
version = "0.8.6"
1127+
version = "0.8.7"
11271128
source = "registry+https://github.com/rust-lang/crates.io-index"
1128-
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
1129+
checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
11291130
dependencies = [
11301131
"cfg-if",
1131-
"windows-targets 0.52.6",
1132+
"windows-targets 0.53.0",
11321133
]
11331134

11341135
[[package]]
@@ -1358,9 +1359,9 @@ dependencies = [
13581359

13591360
[[package]]
13601361
name = "nix"
1361-
version = "0.29.0"
1362+
version = "0.30.1"
13621363
source = "registry+https://github.com/rust-lang/crates.io-index"
1363-
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
1364+
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
13641365
dependencies = [
13651366
"bitflags 2.9.0",
13661367
"cfg-if",
@@ -1640,14 +1641,14 @@ dependencies = [
16401641

16411642
[[package]]
16421643
name = "process-wrap"
1643-
version = "8.2.0"
1644+
version = "8.2.1"
16441645
source = "registry+https://github.com/rust-lang/crates.io-index"
1645-
checksum = "d35f4dc9988d1326b065b4def5e950c3ed727aa03e3151b86cc9e2aec6b03f54"
1646+
checksum = "a3ef4f2f0422f23a82ec9f628ea2acd12871c81a9362b02c43c1aa86acfc3ba1"
16461647
dependencies = [
16471648
"indexmap",
16481649
"nix",
16491650
"tracing",
1650-
"windows 0.59.0",
1651+
"windows 0.61.1",
16511652
]
16521653

16531654
[[package]]
@@ -1749,9 +1750,9 @@ dependencies = [
17491750

17501751
[[package]]
17511752
name = "ra-ap-rustc_abi"
1752-
version = "0.110.0"
1753+
version = "0.113.0"
17531754
source = "registry+https://github.com/rust-lang/crates.io-index"
1754-
checksum = "912228bd8ed3beff1f6f9e5e2d4b37c0827ba3e2070060bf3858a311d0e29e30"
1755+
checksum = "c33b8fa229789975647ca5426be432c7c327ebde89ab15889928185dbcee3230"
17551756
dependencies = [
17561757
"bitflags 2.9.0",
17571758
"ra-ap-rustc_hashes",
@@ -1761,28 +1762,28 @@ dependencies = [
17611762

17621763
[[package]]
17631764
name = "ra-ap-rustc_hashes"
1764-
version = "0.110.0"
1765+
version = "0.113.0"
17651766
source = "registry+https://github.com/rust-lang/crates.io-index"
1766-
checksum = "ba520764daf057a9d963fa769f4762eaf87ac5d4900ae76195eeead64cd35afd"
1767+
checksum = "0d68a3e389927002f552938a90b04787f6435f55b46fc5691360470d1cb2e99d"
17671768
dependencies = [
17681769
"rustc-stable-hash",
17691770
]
17701771

17711772
[[package]]
17721773
name = "ra-ap-rustc_index"
1773-
version = "0.110.0"
1774+
version = "0.113.0"
17741775
source = "registry+https://github.com/rust-lang/crates.io-index"
1775-
checksum = "b76b5f9ee55f2d0e5a65bea23f6d738893349ce8d3d17a6720933e647ab04978"
1776+
checksum = "32502273df2838d0ca13f1c67e2a48feef940e591f9771869f07e2db2acede53"
17761777
dependencies = [
17771778
"ra-ap-rustc_index_macros",
17781779
"smallvec",
17791780
]
17801781

17811782
[[package]]
17821783
name = "ra-ap-rustc_index_macros"
1783-
version = "0.110.0"
1784+
version = "0.113.0"
17841785
source = "registry+https://github.com/rust-lang/crates.io-index"
1785-
checksum = "ddd972eb1face2fcaa0d94c01d97862fb955b5561d4f5932003bce8a6cadd8c6"
1786+
checksum = "8a32f081864ae34c7ae6634edfa7a95ab9260ba85015e8b1d347580eda79d14f"
17861787
dependencies = [
17871788
"proc-macro2",
17881789
"quote",
@@ -1791,9 +1792,9 @@ dependencies = [
17911792

17921793
[[package]]
17931794
name = "ra-ap-rustc_lexer"
1794-
version = "0.110.0"
1795+
version = "0.113.0"
17951796
source = "registry+https://github.com/rust-lang/crates.io-index"
1796-
checksum = "ba3a9876456fb2521097deef33ddeac1c18260c8eafb68054d986f8b9d6ce9fa"
1797+
checksum = "ed34c51974718c5bd90d876d1364d9725159fc8030c2382b9cb837034152ed68"
17971798
dependencies = [
17981799
"memchr",
17991800
"unicode-properties",
@@ -1802,19 +1803,19 @@ dependencies = [
18021803

18031804
[[package]]
18041805
name = "ra-ap-rustc_parse_format"
1805-
version = "0.110.0"
1806+
version = "0.113.0"
18061807
source = "registry+https://github.com/rust-lang/crates.io-index"
1807-
checksum = "8e85de58dfcc60a5f9d5ec0157a657e3f84abd8f22c8a0c4d707cfb42c9011f4"
1808+
checksum = "ff0440e5d27facbf4ff13ea651e48c2f6e360b3dbfc56251b41d60719b965fb8"
18081809
dependencies = [
18091810
"ra-ap-rustc_lexer",
18101811
"rustc-literal-escaper",
18111812
]
18121813

18131814
[[package]]
18141815
name = "ra-ap-rustc_pattern_analysis"
1815-
version = "0.110.0"
1816+
version = "0.113.0"
18161817
source = "registry+https://github.com/rust-lang/crates.io-index"
1817-
checksum = "ceadf9db550db67deff7eff2e2765109b860c9d7e5bdfca144863020289c823d"
1818+
checksum = "a6056efa57aba3aa0cc69a0bf1a8281624c23ad25b05748d11ebcd4668037bfc"
18181819
dependencies = [
18191820
"ra-ap-rustc_index",
18201821
"rustc-hash 2.1.1",
@@ -2228,6 +2229,7 @@ version = "0.0.0"
22282229
dependencies = [
22292230
"backtrace",
22302231
"crossbeam-channel",
2232+
"crossbeam-utils",
22312233
"itertools 0.14.0",
22322234
"jod-thread",
22332235
"libc",
@@ -2750,12 +2752,24 @@ dependencies = [
27502752

27512753
[[package]]
27522754
name = "windows"
2753-
version = "0.59.0"
2755+
version = "0.61.1"
27542756
source = "registry+https://github.com/rust-lang/crates.io-index"
2755-
checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1"
2757+
checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
27562758
dependencies = [
2757-
"windows-core 0.59.0",
2758-
"windows-targets 0.53.0",
2759+
"windows-collections",
2760+
"windows-core 0.61.0",
2761+
"windows-future",
2762+
"windows-link",
2763+
"windows-numerics",
2764+
]
2765+
2766+
[[package]]
2767+
name = "windows-collections"
2768+
version = "0.2.0"
2769+
source = "registry+https://github.com/rust-lang/crates.io-index"
2770+
checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
2771+
dependencies = [
2772+
"windows-core 0.61.0",
27592773
]
27602774

27612775
[[package]]
@@ -2773,15 +2787,25 @@ dependencies = [
27732787

27742788
[[package]]
27752789
name = "windows-core"
2776-
version = "0.59.0"
2790+
version = "0.61.0"
27772791
source = "registry+https://github.com/rust-lang/crates.io-index"
2778-
checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce"
2792+
checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
27792793
dependencies = [
2780-
"windows-implement 0.59.0",
2781-
"windows-interface 0.59.0",
2782-
"windows-result 0.3.1",
2783-
"windows-strings 0.3.1",
2784-
"windows-targets 0.53.0",
2794+
"windows-implement 0.60.0",
2795+
"windows-interface 0.59.1",
2796+
"windows-link",
2797+
"windows-result 0.3.2",
2798+
"windows-strings 0.4.0",
2799+
]
2800+
2801+
[[package]]
2802+
name = "windows-future"
2803+
version = "0.2.0"
2804+
source = "registry+https://github.com/rust-lang/crates.io-index"
2805+
checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
2806+
dependencies = [
2807+
"windows-core 0.61.0",
2808+
"windows-link",
27852809
]
27862810

27872811
[[package]]
@@ -2797,9 +2821,9 @@ dependencies = [
27972821

27982822
[[package]]
27992823
name = "windows-implement"
2800-
version = "0.59.0"
2824+
version = "0.60.0"
28012825
source = "registry+https://github.com/rust-lang/crates.io-index"
2802-
checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
2826+
checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
28032827
dependencies = [
28042828
"proc-macro2",
28052829
"quote",
@@ -2819,9 +2843,9 @@ dependencies = [
28192843

28202844
[[package]]
28212845
name = "windows-interface"
2822-
version = "0.59.0"
2846+
version = "0.59.1"
28232847
source = "registry+https://github.com/rust-lang/crates.io-index"
2824-
checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
2848+
checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
28252849
dependencies = [
28262850
"proc-macro2",
28272851
"quote",
@@ -2830,9 +2854,19 @@ dependencies = [
28302854

28312855
[[package]]
28322856
name = "windows-link"
2833-
version = "0.1.0"
2857+
version = "0.1.1"
2858+
source = "registry+https://github.com/rust-lang/crates.io-index"
2859+
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
2860+
2861+
[[package]]
2862+
name = "windows-numerics"
2863+
version = "0.2.0"
28342864
source = "registry+https://github.com/rust-lang/crates.io-index"
2835-
checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
2865+
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
2866+
dependencies = [
2867+
"windows-core 0.61.0",
2868+
"windows-link",
2869+
]
28362870

28372871
[[package]]
28382872
name = "windows-result"
@@ -2845,9 +2879,9 @@ dependencies = [
28452879

28462880
[[package]]
28472881
name = "windows-result"
2848-
version = "0.3.1"
2882+
version = "0.3.2"
28492883
source = "registry+https://github.com/rust-lang/crates.io-index"
2850-
checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
2884+
checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
28512885
dependencies = [
28522886
"windows-link",
28532887
]
@@ -2864,9 +2898,9 @@ dependencies = [
28642898

28652899
[[package]]
28662900
name = "windows-strings"
2867-
version = "0.3.1"
2901+
version = "0.4.0"
28682902
source = "registry+https://github.com/rust-lang/crates.io-index"
2869-
checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
2903+
checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
28702904
dependencies = [
28712905
"windows-link",
28722906
]
@@ -3230,17 +3264,14 @@ dependencies = [
32303264

32313265
[[package]]
32323266
name = "zip"
3233-
version = "2.4.2"
3267+
version = "3.0.0"
32343268
source = "registry+https://github.com/rust-lang/crates.io-index"
3235-
checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50"
3269+
checksum = "12598812502ed0105f607f941c386f43d441e00148fce9dec3ca5ffb0bde9308"
32363270
dependencies = [
32373271
"arbitrary",
32383272
"crc32fast",
3239-
"crossbeam-utils",
3240-
"displaydoc",
32413273
"flate2",
32423274
"indexmap",
32433275
"memchr",
3244-
"thiserror 2.0.12",
32453276
"time",
32463277
]

0 commit comments

Comments
 (0)