Skip to content

languages: Use rustup rust-analyzer when toolchain override is present#57696

Merged
Veykril merged 1 commit into
mainfrom
push-nulpkymmruly
May 26, 2026
Merged

languages: Use rustup rust-analyzer when toolchain override is present#57696
Veykril merged 1 commit into
mainfrom
push-nulpkymmruly

Conversation

@Veykril

@Veykril Veykril commented May 26, 2026

Copy link
Copy Markdown
Member

rust-analyzer does not really attempt to be backwards compatible, so when users opt-into the component a toolchain override, we should prefer that over any other rust-analyzer (especially our own) for better toolchain compatibility in case people have a more out of date install. This mirrors the VSCode extension behavior

Release Notes:

  • When a worktree contains a Rust toolchain file with a rust analyzer component specified, Zed will now spawn the given toolchain's rust-analyzer for toolchain compatability

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 26, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label May 26, 2026
@Veykril Veykril force-pushed the push-nulpkymmruly branch from 3b7d9bd to 3d6a3ef Compare May 26, 2026 06:19
@Veykril Veykril requested a review from osiewicz May 26, 2026 06:20
Comment thread crates/languages/src/rust.rs Outdated
Comment thread crates/languages/src/rust.rs Outdated
Comment thread crates/languages/src/rust.rs Outdated
@Veykril Veykril force-pushed the push-nulpkymmruly branch 2 times, most recently from 4291abe to a61b5ff Compare May 26, 2026 06:50
osiewicz
osiewicz previously approved these changes May 26, 2026
@Veykril Veykril force-pushed the push-nulpkymmruly branch from a61b5ff to e09bf09 Compare May 26, 2026 07:52
@Veykril Veykril enabled auto-merge May 26, 2026 07:56
@Veykril Veykril force-pushed the push-nulpkymmruly branch 3 times, most recently from c83f6d5 to ad22e44 Compare May 26, 2026 10:58
@Veykril Veykril disabled auto-merge May 26, 2026 11:01
@Veykril Veykril enabled auto-merge May 26, 2026 11:01
@Veykril Veykril closed this May 26, 2026
auto-merge was automatically disabled May 26, 2026 11:09

Pull request was closed

@Veykril Veykril reopened this May 26, 2026
@osiewicz osiewicz dismissed their stale review May 26, 2026 11:40

let's see if this fixes CI

@Veykril Veykril force-pushed the push-nulpkymmruly branch from 5f7db60 to 061d8fc Compare May 26, 2026 13:13
@Veykril Veykril enabled auto-merge May 26, 2026 13:16
@Veykril Veykril force-pushed the push-nulpkymmruly branch from 061d8fc to 146cf17 Compare May 26, 2026 14:33
@Veykril Veykril force-pushed the push-nulpkymmruly branch from 146cf17 to aee1433 Compare May 26, 2026 14:43
@Veykril Veykril added this pull request to the merge queue May 26, 2026
Merged via the queue into main with commit b20cd41 May 26, 2026
32 checks passed
@Veykril Veykril deleted the push-nulpkymmruly branch May 26, 2026 15:01
@zed-zippy zed-zippy Bot added the PR state:needs review Used to label PRs that are in need of a post-merge approval label May 26, 2026
@probably-neb

Copy link
Copy Markdown
Collaborator

@zed-zippy approve

@zed-zippy zed-zippy Bot removed the PR state:needs review Used to label PRs that are in need of a post-merge approval label May 27, 2026
TomPlanche pushed a commit to TomPlanche/zed that referenced this pull request Jun 2, 2026
zed-industries#57696)

rust-analyzer does not really attempt to be backwards compatible, so
when users opt-into the component a toolchain override, we should prefer
that over any other rust-analyzer (especially our own) for better
toolchain compatibility in case people have a more out of date install.
This mirrors the VSCode extension behavior

Release Notes:

- When a worktree contains a Rust toolchain file with a rust analyzer
component specified, Zed will now spawn the given toolchain's
rust-analyzer for toolchain compatability
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants