about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-08-29 12:36:07 +0200
committerMazdak Farrokhzad <twingoow@gmail.com>2019-09-16 16:45:16 +0200
commit9b3e11f635c0354040ce515ac0ed4fade6fe928f (patch)
tree6e8b3b7b7f9b3cc5e3a875cc39069f2b3d647d16
parentd5fe5831ecc82d2705110810261b79ae4040c403 (diff)
downloadrust-9b3e11f635c0354040ce515ac0ed4fade6fe928f.tar.gz
rust-9b3e11f635c0354040ce515ac0ed4fade6fe928f.zip
Const-stabilize `String::new`.
-rw-r--r--src/liballoc/string.rs2
-rw-r--r--src/test/ui/collections-const-new.rs4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index b65f191836e..1166e7b5df2 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 15c5c65ff81..a93f9a136db 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();