From 9b3e11f635c0354040ce515ac0ed4fade6fe928f Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Thu, 29 Aug 2019 12:36:07 +0200
Subject: [PATCH] Const-stabilize `String::new`.

---
 src/liballoc/string.rs               | 2 +-
 src/test/ui/collections-const-new.rs | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index b65f191836e9d..1166e7b5df295 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -369,7 +369,7 @@ impl String {
     /// ```
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[rustc_const_unstable(feature = "const_string_new")]
+    #[cfg_attr(bootstrap, rustc_const_unstable(feature = "const_string_new"))]
     pub const fn new() -> String {
         String { vec: Vec::new() }
     }
diff --git a/src/test/ui/collections-const-new.rs b/src/test/ui/collections-const-new.rs
index 15c5c65ff81f3..a93f9a136db23 100644
--- a/src/test/ui/collections-const-new.rs
+++ b/src/test/ui/collections-const-new.rs
@@ -1,11 +1,9 @@
-// run-pass
+// check-pass
 
 // Test several functions can be used for constants
 // 1. Vec::new()
 // 2. String::new()
 
-#![feature(const_string_new)]
-
 const MY_VEC: Vec<usize> = Vec::new();
 
 const MY_STRING: String = String::new();