Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a0c20d5

Browse files
committedMar 17, 2024
Auto merge of #122628 - lnicola:sync-from-ra, r=lnicola
Subtree update of `rust-analyzer`
2 parents ecdea9e + 20ecf07 commit a0c20d5

File tree

153 files changed

+3374
-1917
lines changed

Some content is hidden

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

153 files changed

+3374
-1917
lines changed
 

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
- os: ubuntu-20.04
3737
target: x86_64-unknown-linux-gnu
3838
code-target: linux-x64
39-
container: ubuntu:18.04
4039
- os: ubuntu-20.04
4140
target: aarch64-unknown-linux-gnu
4241
code-target: linux-arm64
@@ -63,14 +62,6 @@ jobs:
6362
with:
6463
fetch-depth: ${{ env.FETCH_DEPTH }}
6564

66-
- name: Install toolchain dependencies
67-
if: matrix.container == 'ubuntu:18.04'
68-
shell: bash
69-
run: |
70-
apt-get update && apt-get install -y build-essential curl
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-
7465
- name: Install Rust toolchain
7566
run: |
7667
rustup update --no-self-update stable

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ version = "0.0.0"
7171
dependencies = [
7272
"cfg",
7373
"la-arena 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
74+
"lz4_flex",
7475
"rustc-hash",
7576
"salsa",
7677
"semver",
@@ -134,9 +135,9 @@ dependencies = [
134135

135136
[[package]]
136137
name = "cc"
137-
version = "1.0.89"
138+
version = "1.0.90"
138139
source = "registry+https://github.com/rust-lang/crates.io-index"
139-
checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723"
140+
checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
140141

141142
[[package]]
142143
name = "cfg"
@@ -874,9 +875,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
874875

875876
[[package]]
876877
name = "libloading"
877-
version = "0.8.2"
878+
version = "0.8.3"
878879
source = "registry+https://github.com/rust-lang/crates.io-index"
879-
checksum = "2caa5afb8bf9f3a2652760ce7d4f62d21c4d5a423e68466fca30df82f2330164"
880+
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
880881
dependencies = [
881882
"cfg-if",
882883
"windows-targets 0.52.4",
@@ -992,6 +993,12 @@ dependencies = [
992993
"url",
993994
]
994995

996+
[[package]]
997+
name = "lz4_flex"
998+
version = "0.11.2"
999+
source = "registry+https://github.com/rust-lang/crates.io-index"
1000+
checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15"
1001+
9951002
[[package]]
9961003
name = "mbe"
9971004
version = "0.0.0"
@@ -1597,6 +1604,7 @@ dependencies = [
15971604
"rayon",
15981605
"rustc-hash",
15991606
"scip",
1607+
"semver",
16001608
"serde",
16011609
"serde_json",
16021610
"sourcegen",

0 commit comments

Comments
 (0)
Please sign in to comment.