Skip to content

Commit 9170e53

Browse files
BoxyUwUBoxyUwU
authored
Merge pull request #2263 from BoxyUwU/rustc-pull2
Rustc pull
2 parents 55226a8 + 30ddc42 commit 9170e53

File tree

302 files changed

+15087
-6451
lines changed

Some content is hidden

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

302 files changed

+15087
-6451
lines changed

‎.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ f247090558c9ba3c551566eae5882b7ca865225f
1414
b2f6fd4f961fc7e4fbfdb80cae2e6065f8436f15
1515
c48062fe2ab9a2d913d1985a6b0aec4bf936bfc1
1616
f532576ac53ddcc666bc8d59e0b6437065e2f599
17+
4704881b641884de50645637108b6b6f5b68aaf9

‎.github/workflows/autopublish.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111

1212
jobs:
1313
publish:
14+
if: ${{ github.repository == 'rust-lang/rust-analyzer' || github.event.action == 'workflow_dispatch' }}
1415
name: publish
1516
runs-on: ubuntu-latest
1617
steps:

‎.github/workflows/ci.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ jobs:
6464
run: |
6565
rustup update --no-self-update ${{ env.RUST_CHANNEL }}
6666
rustup default ${{ env.RUST_CHANNEL }}
67-
rustup component add --toolchain ${{ env.RUST_CHANNEL }} rustfmt rust-src
67+
rustup component add --toolchain ${{ env.RUST_CHANNEL }} rust-src
68+
# We always use a nightly rustfmt, regardless of channel, because we need
69+
# --file-lines.
70+
rustup toolchain add nightly --profile minimal
71+
rustup component add --toolchain nightly rustfmt
6872
# https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/rust.json
6973
- name: Install Rust Problem Matcher
7074
if: matrix.os == 'ubuntu-latest'

‎.github/workflows/publish-libs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99

1010
jobs:
1111
publish-libs:
12+
if: ${{ github.repository == 'rust-lang/rust-analyzer' || github.event.action == 'workflow_dispatch' }}
1213
name: publish
1314
runs-on: ubuntu-latest
1415
steps:

‎.github/workflows/release.yaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ env:
2222

2323
jobs:
2424
dist:
25+
if: ${{ github.repository == 'rust-lang/rust-analyzer' || github.event.action == 'workflow_dispatch' }}
2526
strategy:
2627
matrix:
2728
include:
@@ -33,14 +34,14 @@ jobs:
3334
- os: windows-latest
3435
target: aarch64-pc-windows-msvc
3536
code-target: win32-arm64
36-
- os: ubuntu-20.04
37+
- os: ubuntu-latest
3738
target: x86_64-unknown-linux-gnu
3839
code-target: linux-x64
3940
container: rockylinux:8
40-
- os: ubuntu-20.04
41+
- os: ubuntu-latest
4142
target: aarch64-unknown-linux-gnu
4243
code-target: linux-arm64
43-
- os: ubuntu-20.04
44+
- os: ubuntu-latest
4445
target: arm-unknown-linux-gnueabihf
4546
code-target: linux-armhf
4647
- os: macos-13
@@ -138,6 +139,7 @@ jobs:
138139
path: ./dist
139140

140141
dist-x86_64-unknown-linux-musl:
142+
if: ${{ github.repository == 'rust-lang/rust-analyzer' || github.event.action == 'workflow_dispatch' }}
141143
name: dist (x86_64-unknown-linux-musl)
142144
runs-on: ubuntu-latest
143145
env:
@@ -183,6 +185,7 @@ jobs:
183185
path: ./dist
184186

185187
publish:
188+
if: ${{ github.repository == 'rust-lang/rust-analyzer' || github.event.action == 'workflow_dispatch' }}
186189
name: publish
187190
runs-on: ubuntu-latest
188191
needs: ["dist", "dist-x86_64-unknown-linux-musl"]
@@ -257,24 +260,24 @@ jobs:
257260
working-directory: ./editors/code
258261

259262
- name: Publish Extension (Code Marketplace, release)
260-
if: github.ref == 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
263+
if: github.ref == 'refs/heads/release' && github.repository == 'rust-lang/rust-analyzer'
261264
working-directory: ./editors/code
262265
# token from https://dev.azure.com/rust-analyzer/
263266
run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix
264267

265268
- name: Publish Extension (OpenVSX, release)
266-
if: github.ref == 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
269+
if: github.ref == 'refs/heads/release' && github.repository == 'rust-lang/rust-analyzer'
267270
working-directory: ./editors/code
268271
run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix
269272
timeout-minutes: 2
270273

271274
- name: Publish Extension (Code Marketplace, nightly)
272-
if: github.ref != 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
275+
if: github.ref != 'refs/heads/release' && github.repository == 'rust-lang/rust-analyzer'
273276
working-directory: ./editors/code
274277
run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix --pre-release
275278

276279
- name: Publish Extension (OpenVSX, nightly)
277-
if: github.ref != 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer')
280+
if: github.ref != 'refs/heads/release' && github.repository == 'rust-lang/rust-analyzer'
278281
working-directory: ./editors/code
279282
run: npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix
280283
timeout-minutes: 2

‎.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ target/
66
*.log
77
*.iml
88
.vscode/settings.json
9-
generated_assists.adoc
10-
generated_features.adoc
11-
generated_diagnostic.adoc
129
.DS_Store
1310
/out/
1411
/dump.lsif
1512
.envrc
13+
docs/book/book
14+
docs/book/src/assists_generated.md
15+
docs/book/src/diagnostics_generated.md
16+
docs/book/src/features_generated.md

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Thank you for your interest in contributing to rust-analyzer! There are many way
44
and we appreciate all of them.
55

66
To get a quick overview of the crates and structure of the project take a look at the
7-
[./docs/dev](./docs/dev) folder.
7+
[Contributing](https://rust-analyzer.github.io/book/contributing) section of the manual.
88

99
If you have any questions please ask them in the [rust-analyzer zulip stream](
1010
https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer) or if unsure where

‎Cargo.lock

Lines changed: 35 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ ide-db = { path = "./crates/ide-db", version = "0.0.0" }
6464
ide-diagnostics = { path = "./crates/ide-diagnostics", version = "0.0.0" }
6565
ide-ssr = { path = "./crates/ide-ssr", version = "0.0.0" }
6666
intern = { path = "./crates/intern", version = "0.0.0" }
67-
limit = { path = "./crates/limit", version = "0.0.0" }
6867
load-cargo = { path = "./crates/load-cargo", version = "0.0.0" }
6968
mbe = { path = "./crates/mbe", version = "0.0.0" }
7069
parser = { path = "./crates/parser", version = "0.0.0" }
@@ -87,11 +86,12 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8786
vfs = { path = "./crates/vfs", version = "0.0.0" }
8887
edition = { path = "./crates/edition", version = "0.0.0" }
8988

90-
ra-ap-rustc_lexer = { version = "0.91", default-features = false }
91-
ra-ap-rustc_parse_format = { version = "0.91", default-features = false }
92-
ra-ap-rustc_index = { version = "0.91", default-features = false }
93-
ra-ap-rustc_abi = { version = "0.91", default-features = false }
94-
ra-ap-rustc_pattern_analysis = { version = "0.91", default-features = false }
89+
ra-ap-rustc_hashes = { version = "0.97", default-features = false }
90+
ra-ap-rustc_lexer = { version = "0.97", default-features = false }
91+
ra-ap-rustc_parse_format = { version = "0.97", default-features = false }
92+
ra-ap-rustc_index = { version = "0.97", default-features = false }
93+
ra-ap-rustc_abi = { version = "0.97", default-features = false }
94+
ra-ap-rustc_pattern_analysis = { version = "0.97", default-features = false }
9595

9696
# local crates that aren't published to crates.io. These should not have versions.
9797

‎PRIVACY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
See the [Privacy](https://rust-analyzer.github.io/manual.html#privacy) section of the user manual.
1+
See the [Privacy](https://rust-analyzer.github.io/book/privacy.html) section of the user manual.

0 commit comments

Comments
 (0)