aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-01 16:33:45 +0000
committerGitHub <[email protected]>2021-01-01 16:33:45 +0000
commitc92c9fdc52ee04a88ee2950a93afc34b4870616b (patch)
tree4d0b7da08fe7955d7a676a075e9011e296d55e86 /docs
parent56a7bf7ede12f6bec194265ea4a95911c9e469bd (diff)
parent273d2f91234367bd1348a6c4d84df22fe35becf5 (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 'docs')
-rw-r--r--docs/user/manual.adoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc
index d4121b401..75445a02e 100644
--- a/docs/user/manual.adoc
+++ b/docs/user/manual.adoc
@@ -339,7 +339,7 @@ interface Crate {
339 /// Path to the root module of the crate. 339 /// Path to the root module of the crate.
340 root_module: string; 340 root_module: string;
341 /// Edition of the crate. 341 /// Edition of the crate.
342 edition: "2015" | "2018"; 342 edition: "2015" | "2018" | "2021";
343 /// Dependencies 343 /// Dependencies
344 deps: Dep[]; 344 deps: Dep[];
345 /// Should this crate be treated as a member of current "workspace". 345 /// Should this crate be treated as a member of current "workspace".