diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-01 16:33:45 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-01 16:33:45 +0000 |
| commit | c92c9fdc52ee04a88ee2950a93afc34b4870616b (patch) | |
| tree | 4d0b7da08fe7955d7a676a075e9011e296d55e86 /crates/ide/src/syntax_highlighting/injection.rs | |
| parent | 56a7bf7ede12f6bec194265ea4a95911c9e469bd (diff) | |
| parent | 273d2f91234367bd1348a6c4d84df22fe35becf5 (diff) | |
Merge #7123
7123: Add support for Rust 2021. r=lnicola a=m-ou-se
This adds `2021` in all places where rust-analyzer already knew about `2015` and `2018`.
The only edition-specific behaviour I could find in the source code was gated on a direct comparison with `Edition2015`, so `Edition2021` should (correctly) behave the same as `Edition2018`:
https://github.com/rust-analyzer/rust-analyzer/blob/56a7bf7ede12f6bec194265ea4a95911c9e469bd/crates/hir_def/src/nameres/path_resolution.rs#L132
Co-authored-by: Mara Bos <[email protected]>
Diffstat (limited to 'crates/ide/src/syntax_highlighting/injection.rs')
| -rw-r--r-- | crates/ide/src/syntax_highlighting/injection.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/crates/ide/src/syntax_highlighting/injection.rs b/crates/ide/src/syntax_highlighting/injection.rs index 9eb184c74..6cbd683c6 100644 --- a/crates/ide/src/syntax_highlighting/injection.rs +++ b/crates/ide/src/syntax_highlighting/injection.rs | |||
| @@ -54,8 +54,17 @@ pub(super) fn highlight_injection( | |||
| 54 | type RangesMap = BTreeMap<TextSize, TextSize>; | 54 | type RangesMap = BTreeMap<TextSize, TextSize>; |
| 55 | 55 | ||
| 56 | const RUSTDOC_FENCE: &'static str = "```"; | 56 | const RUSTDOC_FENCE: &'static str = "```"; |
| 57 | const RUSTDOC_FENCE_TOKENS: &[&'static str] = | 57 | const RUSTDOC_FENCE_TOKENS: &[&'static str] = &[ |
| 58 | &["", "rust", "should_panic", "ignore", "no_run", "compile_fail", "edition2015", "edition2018"]; | 58 | "", |
| 59 | "rust", | ||
| 60 | "should_panic", | ||
| 61 | "ignore", | ||
| 62 | "no_run", | ||
| 63 | "compile_fail", | ||
| 64 | "edition2015", | ||
| 65 | "edition2018", | ||
| 66 | "edition2021", | ||
| 67 | ]; | ||
| 59 | 68 | ||
| 60 | /// Extracts Rust code from documentation comments as well as a mapping from | 69 | /// Extracts Rust code from documentation comments as well as a mapping from |
| 61 | /// the extracted source code back to the original source ranges. | 70 | /// the extracted source code back to the original source ranges. |