language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 14:51:48 +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>, pub proc_macro: Vec<ProcMacro>,
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum Edition { pub enum Edition {
Edition2018,
Edition2015, Edition2015,
Edition2018,
Edition2021,
} }
#[derive(Default, Debug, Clone, PartialEq, Eq)] #[derive(Default, Debug, Clone, PartialEq, Eq)]
@ -393,6 +394,7 @@ impl FromStr for Edition {
let res = match s { let res = match s {
"2015" => Edition::Edition2015, "2015" => Edition::Edition2015,
"2018" => Edition::Edition2018, "2018" => Edition::Edition2018,
"2021" => Edition::Edition2021,
_ => return Err(ParseEditionError { invalid_input: s.to_string() }), _ => return Err(ParseEditionError { invalid_input: s.to_string() }),
}; };
Ok(res) Ok(res)
@ -404,6 +406,7 @@ impl fmt::Display for Edition {
f.write_str(match self { f.write_str(match self {
Edition::Edition2015 => "2015", Edition::Edition2015 => "2015",
Edition::Edition2018 => "2018", Edition::Edition2018 => "2018",
Edition::Edition2021 => "2021",
}) })
} }
} }

2
crates/ide/src/runnables.rs
View file

@ -230,7 +230,7 @@ impl TestAttr {
const RUSTDOC_FENCE: &str = "```"; const RUSTDOC_FENCE: &str = "```";
const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUNNABLE: &[&str] = const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUNNABLE: &[&str] =
&["", "rust", "should_panic", "edition2015", "edition2018"]; &["", "rust", "should_panic", "edition2015", "edition2018", "edition2021"];
fn has_runnable_doc_test(attrs: &hir::Attrs) -> bool { fn has_runnable_doc_test(attrs: &hir::Attrs) -> bool {
attrs.docs().map_or(false, |doc| { attrs.docs().map_or(false, |doc| {

2
crates/ide/src/syntax_highlighting/injection.rs
View file

@ -55,7 +55,7 @@ type RangesMap = BTreeMap<TextSize, TextSize>;
const RUSTDOC_FENCE: &'static str = "```"; const RUSTDOC_FENCE: &'static str = "```";
const RUSTDOC_FENCE_TOKENS: &[&'static str] = const RUSTDOC_FENCE_TOKENS: &[&'static str] =
&["", "rust", "should_panic", "ignore", "no_run", "compile_fail", "edition2015", "edition2018"]; &["", "rust", "should_panic", "ignore", "no_run", "compile_fail", "edition2015", "edition2018", "edition2021"];
/// Extracts Rust code from documentation comments as well as a mapping from /// Extracts Rust code from documentation comments as well as a mapping from
/// the extracted source code back to the original source ranges. /// the extracted source code back to the original source ranges.

3
crates/project_model/src/project_json.rs
View file

@ -139,6 +139,8 @@ enum EditionData {
Edition2015, Edition2015,
#[serde(rename = "2018")] #[serde(rename = "2018")]
Edition2018, Edition2018,
#[serde(rename = "2021")]
Edition2021,
} }
impl From<EditionData> for Edition { impl From<EditionData> for Edition {
@ -146,6 +148,7 @@ impl From<EditionData> for Edition {
match data { match data {
EditionData::Edition2015 => Edition::Edition2015, EditionData::Edition2015 => Edition::Edition2015,
EditionData::Edition2018 => Edition::Edition2018, EditionData::Edition2018 => Edition::Edition2018,
EditionData::Edition2021 => Edition::Edition2021,
} }
} }
} }

2
crates/rust-analyzer/src/markdown.rs
View file

@ -2,7 +2,7 @@
const RUSTDOC_FENCE: &str = "```"; const RUSTDOC_FENCE: &str = "```";
const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUST_SPECIFIC: &[&str] = const RUSTDOC_CODE_BLOCK_ATTRIBUTES_RUST_SPECIFIC: &[&str] =
&["", "rust", "should_panic", "ignore", "no_run", "compile_fail", "edition2015", "edition2018"]; &["", "rust", "should_panic", "ignore", "no_run", "compile_fail", "edition2015", "edition2018", "edition2021"];
pub(crate) fn format_docs(src: &str) -> String { pub(crate) fn format_docs(src: &str) -> String {
let mut processed_lines = Vec::new(); let mut processed_lines = Vec::new();

2
docs/user/manual.adoc
View file

@ -339,7 +339,7 @@ interface Crate {
/// Path to the root module of the crate. /// Path to the root module of the crate.
root_module: string; root_module: string;
/// Edition of the crate. /// Edition of the crate.
edition: "2015" | "2018"; edition: "2015" | "2018" | "2021";
/// Dependencies /// Dependencies
deps: Dep[]; deps: Dep[];
/// Should this crate be treated as a member of current "workspace". /// Should this crate be treated as a member of current "workspace".