From 9bc6d2609233cece91803a8163dc3ba5579dfde8 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Thu, 6 Oct 2016 11:36:36 +1300
Subject: Stabilise `?`

cc [`?` tracking issue](https://github.com/rust-lang/rust/issues/31436)
---
 src/libstd/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd')

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index eee85798841..5a2eb1c1dc4 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -255,7 +255,7 @@
 #![feature(panic_unwind)]
 #![feature(placement_in_syntax)]
 #![feature(prelude_import)]
-#![feature(question_mark)]
+#![cfg_attr(stage0, feature(question_mark))]
 #![feature(rand)]
 #![feature(raw)]
 #![feature(reflect_marker)]
-- 
cgit 1.4.1-3-g733a5