about summary refs log tree commit diff
path: root/compiler/rustc_span
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-08-31 01:03:55 +0000
committerbors <bors@rust-lang.org>2021-08-31 01:03:55 +0000
commit56ea5e0ee948999a916ff5f3d78ed79716d1006b (patch)
tree4ba901b699db3b941942925dded3aac9efba50ed /compiler/rustc_span
parent6f388bb369ddb6fb64e547009e031598425f773c (diff)
parent10eed8f0c59d3c3e40f5a6c25dd5e187d81cf5e6 (diff)
downloadrust-56ea5e0ee948999a916ff5f3d78ed79716d1006b.tar.gz
rust-56ea5e0ee948999a916ff5f3d78ed79716d1006b.zip
Auto merge of #88100 - HTG-YT:edition2021-compopt-stabilization, r=m-ou-se
Make Edition 2021 Stable

An item of #87959.

This is an "on-demand" pull request, which means it will be merged when it is the right time to.
Diffstat (limited to 'compiler/rustc_span')
-rw-r--r--compiler/rustc_span/src/edition.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_span/src/edition.rs b/compiler/rustc_span/src/edition.rs
index 8544acd6d05..511c2e86626 100644
--- a/compiler/rustc_span/src/edition.rs
+++ b/compiler/rustc_span/src/edition.rs
@@ -32,7 +32,7 @@ pub const EDITION_NAME_LIST: &str = "2015|2018|2021";
 
 pub const DEFAULT_EDITION: Edition = Edition::Edition2015;
 
-pub const LATEST_STABLE_EDITION: Edition = Edition::Edition2018;
+pub const LATEST_STABLE_EDITION: Edition = Edition::Edition2021;
 
 impl fmt::Display for Edition {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -66,7 +66,7 @@ impl Edition {
         match *self {
             Edition::Edition2015 => true,
             Edition::Edition2018 => true,
-            Edition::Edition2021 => false,
+            Edition::Edition2021 => true,
         }
     }
 }