Skip to content

Commit 51d4011

Browse files
committed
Auto merge of #123258 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer`
2 parents 0b2f2c4 + 86a5b5a commit 51d4011

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

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
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: |

.github/workflows/publish-libs.yaml

Lines changed: 1 addition & 0 deletions
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

.github/workflows/release.yaml

Lines changed: 13 additions & 4 deletions
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'

Cargo.lock

Lines changed: 26 additions & 17 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 & 5 deletions
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)