Skip to content

Commit 688c30d

Browse files
borsbors
committed
Auto merge of #123258 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer`
2 parents c93b17d + a4e02d7 commit 688c30d

File tree

223 files changed

+5810
-3711
lines changed

Some content is hidden

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

223 files changed

+5810
-3711
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: echo "::add-matcher::.github/rust.json"
7272

7373
- name: Cache Dependencies
74-
uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894
74+
uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012
7575
with:
7676
key: ${{ env.RUST_CHANNEL }}
7777

@@ -140,7 +140,7 @@ jobs:
140140
rustup target add ${{ env.targets }} ${{ env.targets_ide }}
141141
142142
- name: Cache Dependencies
143-
uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894
143+
uses: Swatinem/rust-cache@640a22190e7a783d4c409684cea558f081f92012
144144

145145
- name: Check
146146
run: |

‎src/tools/rust-analyzer/.github/workflows/publish-libs.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ jobs:
3232
git config --global user.name "GitHub Action"
3333
# Remove r-a crates from the workspaces so we don't auto-publish them as well
3434
sed -i 's/ "crates\/\*"//' ./Cargo.toml
35+
sed -i 's/ "xtask\/"//' ./Cargo.toml
3536
cargo workspaces publish --yes --exact --from-git --no-git-commit --allow-dirty

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

+13-4
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- os: ubuntu-20.04
3737
target: x86_64-unknown-linux-gnu
3838
code-target: linux-x64
39+
container: rockylinux:8
3940
- os: ubuntu-20.04
4041
target: aarch64-unknown-linux-gnu
4142
code-target: linux-arm64
@@ -58,20 +59,28 @@ jobs:
5859

5960
steps:
6061
- name: Checkout repository
61-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
6263
with:
6364
fetch-depth: ${{ env.FETCH_DEPTH }}
6465

66+
- name: Install toolchain dependencies
67+
if: matrix.container == 'rockylinux:8'
68+
shell: bash
69+
run: |
70+
dnf install -y gcc
71+
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --profile minimal --default-toolchain none -y
72+
echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
73+
6574
- name: Install Rust toolchain
6675
run: |
6776
rustup update --no-self-update stable
6877
rustup target add ${{ matrix.target }}
6978
rustup component add rust-src
7079
7180
- name: Install Node.js
72-
uses: actions/setup-node@v3
81+
uses: actions/setup-node@v4
7382
with:
74-
node-version: 16
83+
node-version: 18
7584

7685
- name: Update apt repositories
7786
if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf'
@@ -181,7 +190,7 @@ jobs:
181190
- name: Install Nodejs
182191
uses: actions/setup-node@v4
183192
with:
184-
node-version: 18
193+
node-version: 20
185194

186195
- run: echo "TAG=$(date --iso -u)" >> $GITHUB_ENV
187196
if: github.ref == 'refs/heads/release'

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

+26-17
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ dependencies = [
594594
"rustc-hash",
595595
"scoped-tls",
596596
"smallvec",
597+
"span",
597598
"stdx",
598599
"syntax",
599600
"test-fixture",
@@ -637,6 +638,7 @@ dependencies = [
637638
"pulldown-cmark",
638639
"pulldown-cmark-to-cmark",
639640
"smallvec",
641+
"span",
640642
"stdx",
641643
"syntax",
642644
"test-fixture",
@@ -732,6 +734,7 @@ dependencies = [
732734
"ide-db",
733735
"itertools",
734736
"once_cell",
737+
"paths",
735738
"serde_json",
736739
"stdx",
737740
"syntax",
@@ -931,6 +934,7 @@ dependencies = [
931934
"hir-expand",
932935
"ide-db",
933936
"itertools",
937+
"paths",
934938
"proc-macro-api",
935939
"project-model",
936940
"span",
@@ -1225,6 +1229,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
12251229
[[package]]
12261230
name = "paths"
12271231
version = "0.0.0"
1232+
dependencies = [
1233+
"camino",
1234+
]
12281235

12291236
[[package]]
12301237
name = "percent-encoding"
@@ -1375,6 +1382,7 @@ dependencies = [
13751382
"semver",
13761383
"serde",
13771384
"serde_json",
1385+
"span",
13781386
"stdx",
13791387
"toolchain",
13801388
"tracing",
@@ -1432,9 +1440,9 @@ dependencies = [
14321440

14331441
[[package]]
14341442
name = "ra-ap-rustc_abi"
1435-
version = "0.42.0"
1443+
version = "0.44.0"
14361444
source = "registry+https://github.com/rust-lang/crates.io-index"
1437-
checksum = "c2ae52e2d5b08762c9464b541345f519b8719d57b643b73632bade43ecece9dc"
1445+
checksum = "b8709df2a746f055316bc0c62bd30948695a25e734863bf6e1f9755403e010ab"
14381446
dependencies = [
14391447
"bitflags 2.4.2",
14401448
"ra-ap-rustc_index",
@@ -1443,9 +1451,9 @@ dependencies = [
14431451

14441452
[[package]]
14451453
name = "ra-ap-rustc_index"
1446-
version = "0.42.0"
1454+
version = "0.44.0"
14471455
source = "registry+https://github.com/rust-lang/crates.io-index"
1448-
checksum = "bfd7e10c7853fe79443d46e1d2d8ab09fe99926118e59653fb8b480d5045f126"
1456+
checksum = "9ad68bacffb87dcdbb23a3ce11261375078aaa06b85d348c49f39ffd5510dc20"
14491457
dependencies = [
14501458
"arrayvec",
14511459
"ra-ap-rustc_index_macros",
@@ -1454,9 +1462,9 @@ dependencies = [
14541462

14551463
[[package]]
14561464
name = "ra-ap-rustc_index_macros"
1457-
version = "0.42.0"
1465+
version = "0.44.0"
14581466
source = "registry+https://github.com/rust-lang/crates.io-index"
1459-
checksum = "47f1d1c589be6c9a9e852fadee0e60329c0f862e87442ac2fe5adae30663cc76"
1467+
checksum = "8782aaf3a113837c533dfb1c45df91cd17e1fdd1d2f9a20c2e0d1976025c4f1f"
14601468
dependencies = [
14611469
"proc-macro2",
14621470
"quote",
@@ -1466,29 +1474,29 @@ dependencies = [
14661474

14671475
[[package]]
14681476
name = "ra-ap-rustc_lexer"
1469-
version = "0.42.0"
1477+
version = "0.44.0"
14701478
source = "registry+https://github.com/rust-lang/crates.io-index"
1471-
checksum = "fa852373a757b4c723bbdc96ced7f575cad68a1e266e45fee12bc4c69a482d80"
1479+
checksum = "aab683fc8579d09eb72033bd5dc9ba6d701aa9645b5fed087ef19af71184dff3"
14721480
dependencies = [
14731481
"unicode-properties",
14741482
"unicode-xid",
14751483
]
14761484

14771485
[[package]]
14781486
name = "ra-ap-rustc_parse_format"
1479-
version = "0.42.0"
1487+
version = "0.44.0"
14801488
source = "registry+https://github.com/rust-lang/crates.io-index"
1481-
checksum = "2afe3c49accd95a53ac4d72ae13bafc7d115bdd80c8cd56ab09e6fc68f482210"
1489+
checksum = "0bcf9ff5edbf784b67b8ad5e03a068f1300fcc24062c0d476b3018965135d933"
14821490
dependencies = [
14831491
"ra-ap-rustc_index",
14841492
"ra-ap-rustc_lexer",
14851493
]
14861494

14871495
[[package]]
14881496
name = "ra-ap-rustc_pattern_analysis"
1489-
version = "0.42.0"
1497+
version = "0.44.0"
14901498
source = "registry+https://github.com/rust-lang/crates.io-index"
1491-
checksum = "1253da23515d80c377a3998731e0ec3794997b62b989fd47db73efbde6a0bd7c"
1499+
checksum = "d63d1e1d5b2a13273cee1a10011147418f40e12b70f70578ce1dee0f1cafc334"
14921500
dependencies = [
14931501
"ra-ap-rustc_index",
14941502
"rustc-hash",
@@ -1598,6 +1606,7 @@ dependencies = [
15981606
"oorandom",
15991607
"parking_lot",
16001608
"parser",
1609+
"paths",
16011610
"proc-macro-api",
16021611
"profile",
16031612
"project-model",
@@ -1869,20 +1878,16 @@ dependencies = [
18691878
"itertools",
18701879
"once_cell",
18711880
"parser",
1872-
"proc-macro2",
1873-
"quote",
18741881
"ra-ap-rustc_lexer",
18751882
"rayon",
18761883
"rowan",
18771884
"rustc-hash",
18781885
"smol_str",
1879-
"sourcegen",
18801886
"stdx",
18811887
"test-utils",
18821888
"text-edit",
18831889
"tracing",
18841890
"triomphe",
1885-
"ungrammar",
18861891
]
18871892

18881893
[[package]]
@@ -2024,6 +2029,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
20242029
name = "toolchain"
20252030
version = "0.0.0"
20262031
dependencies = [
2032+
"camino",
20272033
"home",
20282034
]
20292035

@@ -2109,7 +2115,6 @@ name = "tt"
21092115
version = "0.0.0"
21102116
dependencies = [
21112117
"smol_str",
2112-
"span",
21132118
"stdx",
21142119
"text-size",
21152120
]
@@ -2438,8 +2443,12 @@ version = "0.1.0"
24382443
dependencies = [
24392444
"anyhow",
24402445
"flate2",
2446+
"itertools",
2447+
"proc-macro2",
2448+
"quote",
24412449
"stdx",
24422450
"time",
2451+
"ungrammar",
24432452
"write-json",
24442453
"xflags",
24452454
"xshell",

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ tt = { path = "./crates/tt", version = "0.0.0" }
8484
vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8585
vfs = { path = "./crates/vfs", version = "0.0.0" }
8686

87-
ra-ap-rustc_lexer = { version = "0.42.0", default-features = false }
88-
ra-ap-rustc_parse_format = { version = "0.42.0", default-features = false }
89-
ra-ap-rustc_index = { version = "0.42.0", default-features = false }
90-
ra-ap-rustc_abi = { version = "0.42.0", default-features = false }
91-
ra-ap-rustc_pattern_analysis = { version = "0.42.0", default-features = false }
87+
ra-ap-rustc_lexer = { version = "0.44.0", default-features = false }
88+
ra-ap-rustc_parse_format = { version = "0.44.0", default-features = false }
89+
ra-ap-rustc_index = { version = "0.44.0", default-features = false }
90+
ra-ap-rustc_abi = { version = "0.44.0", default-features = false }
91+
ra-ap-rustc_pattern_analysis = { version = "0.44.0", default-features = false }
9292

9393
# local crates that aren't published to crates.io. These should not have versions.
9494
sourcegen = { path = "./crates/sourcegen" }
@@ -105,6 +105,7 @@ anyhow = "1.0.75"
105105
arrayvec = "0.7.4"
106106
bitflags = "2.4.1"
107107
cargo_metadata = "0.18.1"
108+
camino = "1.1.6"
108109
chalk-solve = { version = "0.96.0", default-features = false }
109110
chalk-ir = "0.96.0"
110111
chalk-recursive = { version = "0.96.0", default-features = false }

0 commit comments

Comments
 (0)