Skip to content

Commit 4cf5f95

Browse files
committed
Auto merge of #154572 - lnicola:sync-from-ra, r=lnicola
`rust-analyzer` subtree update Subtree update of `rust-analyzer` to rust-lang/rust-analyzer@f1297b2. Created using https://github.com/rust-lang/josh-sync. r? @ghost
2 parents 116458d + 4095cfa commit 4cf5f95

208 files changed

Lines changed: 4830 additions & 2792 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 0
2222

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

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
outputs:
3131
typescript: ${{ steps.filter.outputs.typescript }}
3232
steps:
33-
- uses: actions/checkout@v4
34-
- uses: dorny/paths-filter@1441771bbfdd59dcd748680ee64ebd8faab1a242
33+
- uses: actions/checkout@v6
34+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
3535
id: filter
3636
with:
3737
filters: |
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout repository
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v6
4949
with:
5050
ref: ${{ github.event.pull_request.head.sha }}
5151

@@ -88,7 +88,7 @@ jobs:
8888

8989
steps:
9090
- name: Checkout repository
91-
uses: actions/checkout@v4
91+
uses: actions/checkout@v6
9292
with:
9393
ref: ${{ github.event.pull_request.head.sha }}
9494

@@ -136,7 +136,7 @@ jobs:
136136

137137
steps:
138138
- name: Checkout repository
139-
uses: actions/checkout@v4
139+
uses: actions/checkout@v6
140140

141141
- name: Install Rust toolchain
142142
run: |
@@ -164,7 +164,7 @@ jobs:
164164

165165
steps:
166166
- name: Checkout repository
167-
uses: actions/checkout@v4
167+
uses: actions/checkout@v6
168168

169169
- name: Install Rust toolchain
170170
run: |
@@ -180,7 +180,7 @@ jobs:
180180

181181
steps:
182182
- name: Checkout repository
183-
uses: actions/checkout@v4
183+
uses: actions/checkout@v6
184184

185185
# Note that clippy output is currently dependent on whether rust-src is installed,
186186
# https://github.com/rust-lang/rust-clippy/issues/14625
@@ -202,7 +202,7 @@ jobs:
202202

203203
steps:
204204
- name: Checkout repository
205-
uses: actions/checkout@v4
205+
uses: actions/checkout@v6
206206

207207
- name: Install Rust toolchain
208208
run: |
@@ -226,12 +226,7 @@ jobs:
226226

227227
strategy:
228228
matrix:
229-
target:
230-
[
231-
powerpc-unknown-linux-gnu,
232-
x86_64-unknown-linux-musl,
233-
wasm32-unknown-unknown,
234-
]
229+
target: [powerpc-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-unknown]
235230
include:
236231
# The rust-analyzer binary is not expected to compile on WASM, but the IDE
237232
# crate should
@@ -240,7 +235,7 @@ jobs:
240235

241236
steps:
242237
- name: Checkout repository
243-
uses: actions/checkout@v4
238+
uses: actions/checkout@v6
244239

245240
- name: Install Rust toolchain
246241
run: |
@@ -268,10 +263,10 @@ jobs:
268263

269264
steps:
270265
- name: Checkout repository
271-
uses: actions/checkout@v4
266+
uses: actions/checkout@v6
272267

273268
- name: Install Nodejs
274-
uses: actions/setup-node@v4
269+
uses: actions/setup-node@v6
275270
with:
276271
node-version: 22
277272

@@ -327,7 +322,7 @@ jobs:
327322
run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
328323

329324
- name: Checkout repository
330-
uses: actions/checkout@v4
325+
uses: actions/checkout@v6
331326
with:
332327
ref: ${{ github.event.pull_request.head.sha }}
333328

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
coverage:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717

1818
- name: Install Rust toolchain
1919
run: |
@@ -34,9 +34,9 @@ jobs:
3434

3535
- name: Generate code coverage
3636
run: cargo llvm-cov --workspace --lcov --output-path lcov.info
37-
37+
3838
- name: Upload coverage to Codecov
39-
uses: codecov/codecov-action@v5
39+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
4040
with:
4141
files: lcov.info
4242
fail_ci_if_error: false

src/tools/rust-analyzer/.github/workflows/fuzz.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Fuzz
22
on:
33
schedule:
44
# Once a week
5-
- cron: '0 0 * * 0'
5+
- cron: "0 0 * * 0"
66
push:
77
paths:
8-
- '.github/workflows/fuzz.yml'
8+
- ".github/workflows/fuzz.yml"
99
# Allow manual trigger
1010
workflow_dispatch:
1111

@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
ref: ${{ github.event.pull_request.head.sha }}
3333
fetch-depth: 1

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
rustup component add --toolchain beta rust-src
2424
2525
- name: Checkout repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2727

2828
- name: Cache cargo
2929
uses: actions/cache@v4
@@ -45,7 +45,7 @@ jobs:
4545
key: ${{ runner.os }}-target-${{ github.sha }}
4646

4747
- name: Upload build metrics
48-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@v7
4949
with:
5050
name: build-${{ github.sha }}
5151
path: target/build.json
@@ -66,7 +66,7 @@ jobs:
6666
rustup component add --toolchain beta rust-src
6767
6868
- name: Checkout repository
69-
uses: actions/checkout@v4
69+
uses: actions/checkout@v6
7070

7171
- name: Restore target cache
7272
uses: actions/cache@v4
@@ -78,7 +78,7 @@ jobs:
7878
run: cargo xtask metrics "${{ matrix.names }}"
7979

8080
- name: Upload metrics
81-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@v7
8282
with:
8383
name: ${{ matrix.names }}-${{ github.sha }}
8484
path: target/${{ matrix.names }}.json
@@ -89,35 +89,35 @@ jobs:
8989
needs: [build_metrics, other_metrics]
9090
steps:
9191
- name: Checkout repository
92-
uses: actions/checkout@v4
92+
uses: actions/checkout@v6
9393

9494
- name: Download build metrics
95-
uses: actions/download-artifact@v4
95+
uses: actions/download-artifact@v8
9696
with:
9797
name: build-${{ github.sha }}
9898

9999
- name: Download self metrics
100-
uses: actions/download-artifact@v4
100+
uses: actions/download-artifact@v8
101101
with:
102102
name: self-${{ github.sha }}
103103

104104
- name: Download ripgrep-13.0.0 metrics
105-
uses: actions/download-artifact@v4
105+
uses: actions/download-artifact@v8
106106
with:
107107
name: ripgrep-13.0.0-${{ github.sha }}
108108

109109
- name: Download webrender-2022 metrics
110-
uses: actions/download-artifact@v4
110+
uses: actions/download-artifact@v8
111111
with:
112112
name: webrender-2022-${{ github.sha }}
113113

114114
- name: Download diesel-1.4.8 metrics
115-
uses: actions/download-artifact@v4
115+
uses: actions/download-artifact@v8
116116
with:
117117
name: diesel-1.4.8-${{ github.sha }}
118118

119119
- name: Download hyper-0.14.18 metrics
120-
uses: actions/download-artifact@v4
120+
uses: actions/download-artifact@v8
121121
with:
122122
name: hyper-0.14.18-${{ github.sha }}
123123

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
with:
1919
fetch-depth: 0
2020

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ jobs:
7070

7171
steps:
7272
- name: Checkout repository
73-
uses: actions/checkout@v4
73+
uses: actions/checkout@v6
7474
with:
7575
fetch-depth: ${{ env.FETCH_DEPTH }}
7676

7777
- name: Install Node.js toolchain
78-
uses: actions/setup-node@v4
78+
uses: actions/setup-node@v6
7979
with:
8080
node-version: 22
8181

@@ -143,7 +143,7 @@ jobs:
143143
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats --with-deps --no-sysroot --no-test $(rustc --print sysroot)/lib/rustlib/src/rust/library/std -q
144144

145145
- name: Upload artifacts
146-
uses: actions/upload-artifact@v4
146+
uses: actions/upload-artifact@v7
147147
with:
148148
name: dist-${{ matrix.target }}
149149
path: ./dist
@@ -166,7 +166,7 @@ jobs:
166166
run: apk add --no-cache git clang lld musl-dev nodejs npm
167167

168168
- name: Checkout repository
169-
uses: actions/checkout@v4
169+
uses: actions/checkout@v6
170170
with:
171171
fetch-depth: ${{ env.FETCH_DEPTH }}
172172

@@ -189,7 +189,7 @@ jobs:
189189
- run: rm -rf editors/code/server
190190

191191
- name: Upload artifacts
192-
uses: actions/upload-artifact@v4
192+
uses: actions/upload-artifact@v7
193193
with:
194194
name: dist-x86_64-unknown-linux-musl
195195
path: ./dist
@@ -201,7 +201,7 @@ jobs:
201201
needs: ["dist", "dist-x86_64-unknown-linux-musl"]
202202
steps:
203203
- name: Install Nodejs
204-
uses: actions/setup-node@v4
204+
uses: actions/setup-node@v6
205205
with:
206206
node-version: 22
207207

@@ -212,46 +212,46 @@ jobs:
212212
- run: 'echo "TAG: $TAG"'
213213

214214
- name: Checkout repository
215-
uses: actions/checkout@v4
215+
uses: actions/checkout@v6
216216
with:
217217
fetch-depth: ${{ env.FETCH_DEPTH }}
218218

219219
- run: echo "HEAD_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
220220
- run: 'echo "HEAD_SHA: $HEAD_SHA"'
221221

222-
- uses: actions/download-artifact@v4
222+
- uses: actions/download-artifact@v8
223223
with:
224224
name: dist-aarch64-apple-darwin
225225
path: dist
226-
- uses: actions/download-artifact@v4
226+
- uses: actions/download-artifact@v8
227227
with:
228228
name: dist-x86_64-apple-darwin
229229
path: dist
230-
- uses: actions/download-artifact@v4
230+
- uses: actions/download-artifact@v8
231231
with:
232232
name: dist-x86_64-unknown-linux-gnu
233233
path: dist
234-
- uses: actions/download-artifact@v4
234+
- uses: actions/download-artifact@v8
235235
with:
236236
name: dist-x86_64-unknown-linux-musl
237237
path: dist
238-
- uses: actions/download-artifact@v4
238+
- uses: actions/download-artifact@v8
239239
with:
240240
name: dist-aarch64-unknown-linux-gnu
241241
path: dist
242-
- uses: actions/download-artifact@v4
242+
- uses: actions/download-artifact@v8
243243
with:
244244
name: dist-arm-unknown-linux-gnueabihf
245245
path: dist
246-
- uses: actions/download-artifact@v4
246+
- uses: actions/download-artifact@v8
247247
with:
248248
name: dist-x86_64-pc-windows-msvc
249249
path: dist
250-
- uses: actions/download-artifact@v4
250+
- uses: actions/download-artifact@v8
251251
with:
252252
name: dist-i686-pc-windows-msvc
253253
path: dist
254-
- uses: actions/download-artifact@v4
254+
- uses: actions/download-artifact@v8
255255
with:
256256
name: dist-aarch64-pc-windows-msvc
257257
path: dist

0 commit comments

Comments
 (0)