From 5d1022ad7b82168aee243d2adcbd83d1e886586f Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 5 Mar 2019 11:47:52 +0100
Subject: [PATCH] Rename the feature gate for alloc::prelude
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… to separate it from that of the crate.

New tracking issue: https://github.com/rust-lang/rust/issues/58935
---
 src/liballoc/prelude/mod.rs |  3 ++-
 src/liballoc/prelude/v1.rs  | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/liballoc/prelude/mod.rs b/src/liballoc/prelude/mod.rs
index 44a859d31ecb4..33cc51d173203 100644
--- a/src/liballoc/prelude/mod.rs
+++ b/src/liballoc/prelude/mod.rs
@@ -6,10 +6,11 @@
 //! ```
 //! # #![allow(unused_imports)]
 //! # #![feature(alloc)]
+//! #![feature(alloc_prelude)]
 //! extern crate alloc;
 //! use alloc::prelude::v1::*;
 //! ```
 
-#![unstable(feature = "alloc", issue = "27783")]
+#![unstable(feature = "alloc_prelude", issue = "58935")]
 
 pub mod v1;
diff --git a/src/liballoc/prelude/v1.rs b/src/liballoc/prelude/v1.rs
index 2df330d19f8ce..b6b01395ad632 100644
--- a/src/liballoc/prelude/v1.rs
+++ b/src/liballoc/prelude/v1.rs
@@ -2,10 +2,10 @@
 //!
 //! See the [module-level documentation](../index.html) for more.
 
-#![unstable(feature = "alloc", issue = "27783")]
+#![unstable(feature = "alloc_prelude", issue = "58935")]
 
-#[unstable(feature = "alloc", issue = "27783")] pub use crate::borrow::ToOwned;
-#[unstable(feature = "alloc", issue = "27783")] pub use crate::boxed::Box;
-#[unstable(feature = "alloc", issue = "27783")] pub use crate::slice::SliceConcatExt;
-#[unstable(feature = "alloc", issue = "27783")] pub use crate::string::{String, ToString};
-#[unstable(feature = "alloc", issue = "27783")] pub use crate::vec::Vec;
+#[unstable(feature = "alloc_prelude", issue = "58935")] pub use crate::borrow::ToOwned;
+#[unstable(feature = "alloc_prelude", issue = "58935")] pub use crate::boxed::Box;
+#[unstable(feature = "alloc_prelude", issue = "58935")] pub use crate::slice::SliceConcatExt;
+#[unstable(feature = "alloc_prelude", issue = "58935")] pub use crate::string::{String, ToString};
+#[unstable(feature = "alloc_prelude", issue = "58935")] pub use crate::vec::Vec;