about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2018-03-19 01:31:04 -0500
committerTyler Mandry <tmandry@gmail.com>2018-03-19 01:31:04 -0500
commit97b3bf99f667736c3220a91b72a587eafe4cda49 (patch)
tree9d7ffe740df57f72712c2013c2dd2eff90e90cf5 /src/libsyntax
parentc5c650d670f5f191ea9667b455c15a607e550fdb (diff)
downloadrust-97b3bf99f667736c3220a91b72a587eafe4cda49.tar.gz
rust-97b3bf99f667736c3220a91b72a587eafe4cda49.zip
Stabilize termination_trait
This stabilizes `main` with non-() return types; see #48453.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 0950965233f..781071b7f7f 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -429,9 +429,6 @@ declare_features! (
     // `foo.rs` as an alternative to `foo/mod.rs`
     (active, non_modrs_mods, "1.24.0", Some(44660), None),
 
-    // Termination trait in main (RFC 1937)
-    (active, termination_trait, "1.24.0", Some(43301), None),
-
     // Termination trait in tests (RFC 1937)
     (active, termination_trait_test, "1.24.0", Some(48854), None),
 
@@ -558,6 +555,8 @@ declare_features! (
     (accepted, inclusive_range_syntax, "1.26.0", Some(28237), None),
     // allow `..=` in patterns (RFC 1192)
     (accepted, dotdoteq_in_patterns, "1.26.0", Some(28237), None),
+    // Termination trait in main (RFC 1937)
+    (accepted, termination_trait, "1.26.0", Some(43301), None),
 );
 
 // If you change this, please modify src/doc/unstable-book as well. You must