Skip to content

Commit da96244

Browse files
committed
Auto merge of #121255 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer` r? ghost
2 parents bf9333d + a8168c5 commit da96244

File tree

178 files changed

+7095
-1959
lines changed

Some content is hidden

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

178 files changed

+7095
-1959
lines changed

.github/rust.json

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "rustfmt",
5+
"severity": "warning",
6+
"pattern": [
7+
{
8+
"regexp": "^(Diff in (.+)) at line (\\d+):$",
9+
"message": 1,
10+
"file": 2,
11+
"line": 3
12+
}
13+
]
14+
},
15+
{
16+
"owner": "clippy",
17+
"pattern": [
18+
{
19+
"regexp": "^(?:\\x1b\\[[\\d;]+m)*(warning|warn|error)(?:\\x1b\\[[\\d;]+m)*(\\[(.*)\\])?(?:\\x1b\\[[\\d;]+m)*:(?:\\x1b\\[[\\d;]+m)* ([^\\x1b]*)(?:\\x1b\\[[\\d;]+m)*$",
20+
"severity": 1,
21+
"message": 4,
22+
"code": 3
23+
},
24+
{
25+
"regexp": "^(?:\\x1b\\[[\\d;]+m)*\\s*(?:\\x1b\\[[\\d;]+m)*\\s*--> (?:\\x1b\\[[\\d;]+m)*(.*):(\\d*):(\\d*)(?:\\x1b\\[[\\d;]+m)*$",
26+
"file": 1,
27+
"line": 2,
28+
"column": 3
29+
}
30+
]
31+
}
32+
]
33+
}

.github/workflows/autopublish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 0
2121

.github/workflows/ci.yaml

+14-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
typescript: ${{ steps.filter.outputs.typescript }}
2828
proc_macros: ${{ steps.filter.outputs.proc_macros }}
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- uses: dorny/paths-filter@1441771bbfdd59dcd748680ee64ebd8faab1a242
3232
id: filter
3333
with:
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- name: Checkout repository
59-
uses: actions/checkout@v3
59+
uses: actions/checkout@v4
6060
with:
6161
ref: ${{ github.event.pull_request.head.sha }}
6262

@@ -65,6 +65,10 @@ jobs:
6565
rustup update --no-self-update ${{ env.RUST_CHANNEL }}
6666
rustup component add --toolchain ${{ env.RUST_CHANNEL }} rustfmt rust-src
6767
rustup default ${{ env.RUST_CHANNEL }}
68+
# https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/rust.json
69+
- name: Install Rust Problem Matcher
70+
if: matrix.os == 'ubuntu-latest'
71+
run: echo "::add-matcher::.github/rust.json"
6872

6973
- name: Cache Dependencies
7074
uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894
@@ -107,6 +111,10 @@ jobs:
107111
if: matrix.os == 'windows-latest'
108112
run: cargo clippy --all-targets -- -D clippy::disallowed_macros -D clippy::dbg_macro -D clippy::todo -D clippy::print_stdout -D clippy::print_stderr
109113

114+
- name: rustfmt
115+
if: matrix.os == 'ubuntu-latest'
116+
run: cargo fmt -- --check
117+
110118
# Weird targets to catch non-portable code
111119
rust-cross:
112120
if: github.repository == 'rust-lang/rust-analyzer'
@@ -121,7 +129,7 @@ jobs:
121129

122130
steps:
123131
- name: Checkout repository
124-
uses: actions/checkout@v3
132+
uses: actions/checkout@v4
125133

126134
- name: Install Rust toolchain
127135
run: |
@@ -153,13 +161,13 @@ jobs:
153161

154162
steps:
155163
- name: Checkout repository
156-
uses: actions/checkout@v3
164+
uses: actions/checkout@v4
157165
if: needs.changes.outputs.typescript == 'true'
158166

159167
- name: Install Nodejs
160-
uses: actions/setup-node@v3
168+
uses: actions/setup-node@v4
161169
with:
162-
node-version: 16
170+
node-version: 18
163171
if: needs.changes.outputs.typescript == 'true'
164172

165173
- name: Install xvfb

.github/workflows/fuzz.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

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

.github/workflows/metrics.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
rustup component add rustfmt rust-src
2222
rustup default stable
2323
- name: Cache cargo
24-
uses: actions/cache@v3
24+
uses: actions/cache@v4
2525
with:
2626
path: |
2727
~/.cargo/bin/
@@ -36,10 +36,10 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4040

4141
- name: Restore cargo cache
42-
uses: actions/cache@v3
42+
uses: actions/cache@v4
4343
with:
4444
path: |
4545
~/.cargo/bin/
@@ -52,7 +52,7 @@ jobs:
5252
run: cargo xtask metrics build
5353

5454
- name: Cache target
55-
uses: actions/cache@v3
55+
uses: actions/cache@v4
5656
with:
5757
path: target/
5858
key: ${{ runner.os }}-target-${{ github.sha }}
@@ -73,10 +73,10 @@ jobs:
7373

7474
steps:
7575
- name: Checkout repository
76-
uses: actions/checkout@v3
76+
uses: actions/checkout@v4
7777

7878
- name: Restore cargo cache
79-
uses: actions/cache@v3
79+
uses: actions/cache@v4
8080
with:
8181
path: |
8282
~/.cargo/bin/
@@ -86,7 +86,7 @@ jobs:
8686
key: ${{ runner.os }}-cargo-${{ github.sha }}
8787

8888
- name: Restore target cache
89-
uses: actions/cache@v3
89+
uses: actions/cache@v4
9090
with:
9191
path: target/
9292
key: ${{ runner.os }}-target-${{ github.sha }}
@@ -106,7 +106,7 @@ jobs:
106106
needs: [build_metrics, other_metrics]
107107
steps:
108108
- name: Checkout repository
109-
uses: actions/checkout@v3
109+
uses: actions/checkout@v4
110110

111111
- name: Download build metrics
112112
uses: actions/download-artifact@v3

.github/workflows/publish-libs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0
1919

.github/workflows/release.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
steps:
6161
- name: Checkout repository
62-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
6363
with:
6464
fetch-depth: ${{ env.FETCH_DEPTH }}
6565

@@ -78,9 +78,9 @@ jobs:
7878
rustup component add rust-src
7979
8080
- name: Install Node.js
81-
uses: actions/setup-node@v3
81+
uses: actions/setup-node@v4
8282
with:
83-
node-version: 16
83+
node-version: 18
8484

8585
- name: Update apt repositories
8686
if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf'
@@ -154,7 +154,7 @@ jobs:
154154
run: apk add --no-cache git clang lld musl-dev nodejs npm
155155

156156
- name: Checkout repository
157-
uses: actions/checkout@v3
157+
uses: actions/checkout@v4
158158
with:
159159
fetch-depth: ${{ env.FETCH_DEPTH }}
160160

@@ -188,9 +188,9 @@ jobs:
188188
needs: ["dist", "dist-x86_64-unknown-linux-musl"]
189189
steps:
190190
- name: Install Nodejs
191-
uses: actions/setup-node@v3
191+
uses: actions/setup-node@v4
192192
with:
193-
node-version: 16
193+
node-version: 18
194194

195195
- run: echo "TAG=$(date --iso -u)" >> $GITHUB_ENV
196196
if: github.ref == 'refs/heads/release'
@@ -199,7 +199,7 @@ jobs:
199199
- run: 'echo "TAG: $TAG"'
200200

201201
- name: Checkout repository
202-
uses: actions/checkout@v3
202+
uses: actions/checkout@v4
203203
with:
204204
fetch-depth: ${{ env.FETCH_DEPTH }}
205205

.github/workflows/rustdoc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Install Rust toolchain
2323
run: rustup update --no-self-update stable

Cargo.lock

+9-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ ra-ap-rustc_lexer = { version = "0.35.0", default-features = false }
8484
ra-ap-rustc_parse_format = { version = "0.35.0", default-features = false }
8585
ra-ap-rustc_index = { version = "0.35.0", default-features = false }
8686
ra-ap-rustc_abi = { version = "0.35.0", default-features = false }
87-
ra-ap-rustc_pattern_analysis = { version = "0.36.0", default-features = false }
87+
ra-ap-rustc_pattern_analysis = { version = "0.37.0", default-features = false }
8888

8989
# local crates that aren't published to crates.io. These should not have versions.
9090
sourcegen = { path = "./crates/sourcegen" }

0 commit comments

Comments
 (0)