Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22311 from ribru17/lockfile_version_stable
fix: revert ba09b331 now that 1.95.0 is stable
Chayim Refael Friedman 8 days ago
parent c58f7e2 · parent fb0c8bd · commit 628131b
-rw-r--r--crates/project-model/src/cargo_config_file.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/crates/project-model/src/cargo_config_file.rs b/crates/project-model/src/cargo_config_file.rs
index 9ce88484f7..ae36deb71f 100644
--- a/crates/project-model/src/cargo_config_file.rs
+++ b/crates/project-model/src/cargo_config_file.rs
@@ -158,15 +158,14 @@ pub(crate) fn make_lockfile_copy(
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,
- };
+ 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,
+ };
let usage = if *toolchain_version >= MINIMUM_TOOLCHAIN_VERSION_SUPPORTING_LOCKFILE_PATH_ENV {
LockfileUsage::WithEnvVar