about summary refs log tree commit diff
path: root/src/libstd
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/libstd
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/libstd')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 70a1f82c9a1..33da0e57886 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -308,7 +308,6 @@
 #![feature(str_char)]
 #![feature(str_internals)]
 #![feature(str_utf16)]
-#![feature(termination_trait)]
 #![feature(test, rustc_private)]
 #![feature(thread_local)]
 #![feature(toowned_clone_into)]
@@ -325,6 +324,7 @@
 #![cfg_attr(test, feature(update_panic_count))]
 #![cfg_attr(windows, feature(used))]
 #![cfg_attr(stage0, feature(never_type))]
+#![cfg_attr(stage0, feature(termination_trait))]
 
 #![default_lib_allocator]