language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-25 13:23:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Auto merge of #16151 - lnicola:minimal-2024-edition, r=davidbarsky

Browse source 
internal: Add minimal support for the 2024 edition

CC #16146
This commit is contained in:
bors 2023-12-18 17:33:20 +00:00
commit 0ed815faca
4 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/project-model/src/cargo_workspace.rs
View file

@ -330,6 +330,7 @@ impl CargoWorkspace {
cargo_metadata::Edition::E2015 => Edition::Edition2015,
cargo_metadata::Edition::E2018 => Edition::Edition2018,
cargo_metadata::Edition::E2021 => Edition::Edition2021,
cargo_metadata::Edition::_E2024 => Edition::Edition2024,
_ => {
tracing::error!("Unsupported edition `{:?}`", edition);
Edition::CURRENT

3
crates/project-model/src/project_json.rs
View file

@ -213,6 +213,8 @@ enum EditionData {
Edition2018,
#[serde(rename = "2021")]
Edition2021,
#[serde(rename = "2024")]
Edition2024,
}
impl From<EditionData> for Edition {
@ -221,6 +223,7 @@ impl From<EditionData> for Edition {
EditionData::Edition2015 => Edition::Edition2015,
EditionData::Edition2018 => Edition::Edition2018,
EditionData::Edition2021 => Edition::Edition2021,
EditionData::Edition2024 => Edition::Edition2024,
}
}
}