Skip to content

Commit a0dfff1

Browse files
committed
Add minimal support for the 2024 edition
1 parent 21b06c1 commit a0dfff1

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

crates/base-db/src/input.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ pub enum Edition {
398398
Edition2015,
399399
Edition2018,
400400
Edition2021,
401+
Edition2024,
401402
}
402403

403404
impl Edition {
@@ -784,6 +785,7 @@ impl FromStr for Edition {
784785
"2015" => Edition::Edition2015,
785786
"2018" => Edition::Edition2018,
786787
"2021" => Edition::Edition2021,
788+
"2024" => Edition::Edition2024,
787789
_ => return Err(ParseEditionError { invalid_input: s.to_string() }),
788790
};
789791
Ok(res)
@@ -796,6 +798,7 @@ impl fmt::Display for Edition {
796798
Edition::Edition2015 => "2015",
797799
Edition::Edition2018 => "2018",
798800
Edition::Edition2021 => "2021",
801+
Edition::Edition2024 => "2024",
799802
})
800803
}
801804
}

crates/hir-def/src/nameres/collector.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,8 @@ impl DefCollector<'_> {
545545
Edition::Edition2015 => name![rust_2015],
546546
Edition::Edition2018 => name![rust_2018],
547547
Edition::Edition2021 => name![rust_2021],
548+
// FIXME: update this when rust_2024 exists
549+
Edition::Edition2024 => name![rust_2021],
548550
};
549551

550552
let path_kind = match self.def_map.data.edition {

crates/project-model/src/project_json.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ enum EditionData {
213213
Edition2018,
214214
#[serde(rename = "2021")]
215215
Edition2021,
216+
#[serde(rename = "2024")]
217+
Edition2024,
216218
}
217219

218220
impl From<EditionData> for Edition {
@@ -221,6 +223,7 @@ impl From<EditionData> for Edition {
221223
EditionData::Edition2015 => Edition::Edition2015,
222224
EditionData::Edition2018 => Edition::Edition2018,
223225
EditionData::Edition2021 => Edition::Edition2021,
226+
EditionData::Edition2024 => Edition::Edition2024,
224227
}
225228
}
226229
}

0 commit comments

Comments
 (0)