From 2b49ec0bb676f324806bb271f4115c3a1c0afaf3 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 5 Mar 2019 09:58:47 +0100
Subject: [PATCH] Move alloc::prelude::* to alloc::prelude::v1, make alloc a
 subset of std

This was one of the unresolved questions of https://github.com/rust-lang/rfcs/pull/2480.
As the RFC says this is maybe not useful in the sense that we are unlikely
to ever have a second version, but making the crate a true subset
makes one less issue to think about if we stabilize it and later
want to merge standard library crates and have Cargo feature flags
to enable or disable parts of the `std` crate.

See also discussion in https://github.com/rust-lang/rust/pull/58175
---
 src/liballoc/prelude/mod.rs                | 15 +++++++++++++++
 src/liballoc/{prelude.rs => prelude/v1.rs} | 12 ++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 src/liballoc/prelude/mod.rs
 rename src/liballoc/{prelude.rs => prelude/v1.rs} (60%)

diff --git a/src/liballoc/prelude/mod.rs b/src/liballoc/prelude/mod.rs
new file mode 100644
index 00000000000..44a859d31ec
--- /dev/null
+++ b/src/liballoc/prelude/mod.rs
@@ -0,0 +1,15 @@
+//! The alloc Prelude
+//!
+//! The purpose of this module is to alleviate imports of commonly-used
+//! items of the `alloc` crate by adding a glob import to the top of modules:
+//!
+//! ```
+//! # #![allow(unused_imports)]
+//! # #![feature(alloc)]
+//! extern crate alloc;
+//! use alloc::prelude::v1::*;
+//! ```
+
+#![unstable(feature = "alloc", issue = "27783")]
+
+pub mod v1;
diff --git a/src/liballoc/prelude.rs b/src/liballoc/prelude/v1.rs
similarity index 60%
rename from src/liballoc/prelude.rs
rename to src/liballoc/prelude/v1.rs
index 6767cf89f73..2df330d19f8 100644
--- a/src/liballoc/prelude.rs
+++ b/src/liballoc/prelude/v1.rs
@@ -1,14 +1,6 @@
-//! The alloc Prelude
+//! The first version of the prelude of `alloc` crate.
 //!
-//! The purpose of this module is to alleviate imports of commonly-used
-//! items of the `alloc` crate by adding a glob import to the top of modules:
-//!
-//! ```
-//! # #![allow(unused_imports)]
-//! # #![feature(alloc)]
-//! extern crate alloc;
-//! use alloc::prelude::*;
-//! ```
+//! See the [module-level documentation](../index.html) for more.
 
 #![unstable(feature = "alloc", issue = "27783")]
 
-- 
2.44.0