language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add support for Rust 2021.

Browse source
This commit is contained in:
Mara Bos 2021-01-01 17:22:23 +01:00
parent 56a7bf7ede
commit 4833972067
6 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/base_db/src/input.rs
View file

@ -190,10 +190,11 @@ pub struct CrateData {
pub proc_macro: Vec<ProcMacro>,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum Edition {
Edition2018,
Edition2015,
Edition2018,
Edition2021,
}
#[derive(Default, Debug, Clone, PartialEq, Eq)]
@ -393,6 +394,7 @@ impl FromStr for Edition {
let res = match s {
"2015" => Edition::Edition2015,
"2018" => Edition::Edition2018,
"2021" => Edition::Edition2021,
_ => return Err(ParseEditionError { invalid_input: s.to_string() }),
};
Ok(res)
@ -404,6 +406,7 @@ impl fmt::Display for Edition {
f.write_str(match self {
Edition::Edition2015 => "2015",
Edition::Edition2018 => "2018",
Edition::Edition2021 => "2021",
})
}
}