Auto merge of #35856 - phimuemue:master, r=brson

[rust.git] / src / libcollections / lib.rs

diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 21387a1aa95543031fa403d3893c2a102f9afed1..c5a921693475a60e7ec1abfef9f78274ef742c11 100644 (file)
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -37,6 +37,7 @@
 #![feature(core_intrinsics)]
 #![feature(dropck_parametricity)]
 #![feature(fmt_internals)]
+#![feature(fused)]
 #![feature(heap_api)]
 #![feature(inclusive_range)]
 #![feature(lang_items)]
@@ -51,7 +52,7 @@
 #![feature(step_by)]
 #![feature(unicode)]
 #![feature(unique)]
-#![feature(unsafe_no_drop_flag)]
+#![cfg_attr(stage0, feature(unsafe_no_drop_flag))]
 #![cfg_attr(test, feature(rand, test))]
 
 #![no_std]