Skip to content

[beta] backport rust-analyzer lockfile-path fix #153530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 2 commits into from
Mar 9, 2026
Merged

[beta] backport rust-analyzer lockfile-path fix #153530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b93cdbf
Use -Zlockfile-path on every 1.95 nightly
lnicola Feb 27, 2026
d2cb7e4
Tweak pre-release check for beta
lnicola Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/tools/rust-analyzer/crates/project-model/src/cargo_config_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,15 @@ pub(crate) fn make_lockfile_copy(
build: semver::BuildMetadata::EMPTY,
};

const MINIMUM_TOOLCHAIN_VERSION_SUPPORTING_LOCKFILE_PATH_ENV: semver::Version =
semver::Version {
major: 1,
minor: 95,
patch: 0,
pre: semver::Prerelease::EMPTY,
build: semver::BuildMetadata::EMPTY,
};
// TODO: turn this into a const and remove pre once 1.95 is stable
#[allow(non_snake_case)]
let MINIMUM_TOOLCHAIN_VERSION_SUPPORTING_LOCKFILE_PATH_ENV: semver::Version = semver::Version {
major: 1,
minor: 95,
patch: 0,
pre: semver::Prerelease::new("beta").unwrap(),
build: semver::BuildMetadata::EMPTY,
};

let usage = if *toolchain_version >= MINIMUM_TOOLCHAIN_VERSION_SUPPORTING_LOCKFILE_PATH_ENV {
LockfileUsage::WithEnvVar
Expand Down
Loading