about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-08-17 14:02:15 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-08-17 19:35:52 -0700
commit5990249e48efe285fb37be104697af7e68cb3013 (patch)
treead9e6b97a0d89077ab61c27c242b6affc5600492
parent0c849de1a2bad4b63b15b0155ecef8758f5211e5 (diff)
downloadrust-5990249e48efe285fb37be104697af7e68cb3013.tar.gz
rust-5990249e48efe285fb37be104697af7e68cb3013.zip
core: Stabilize prelude::v1
This commit stabilizes the prelude::v1 module of libcore after verifying that
it's a subset of the prelude of the standard library with the addition of a few
extension traits.
-rw-r--r--src/libcore/prelude/mod.rs2
-rw-r--r--src/libcore/prelude/v1.rs35
2 files changed, 19 insertions, 18 deletions
diff --git a/src/libcore/prelude/mod.rs b/src/libcore/prelude/mod.rs
index b6c93615378..99b1947c84e 100644
--- a/src/libcore/prelude/mod.rs
+++ b/src/libcore/prelude/mod.rs
@@ -10,4 +10,6 @@
 
 //! The libcore prelude
 
+#![stable(feature = "core_prelude", since = "1.4.0")]
+
 pub mod v1;
diff --git a/src/libcore/prelude/v1.rs b/src/libcore/prelude/v1.rs
index fc4e4e66817..0457188586e 100644
--- a/src/libcore/prelude/v1.rs
+++ b/src/libcore/prelude/v1.rs
@@ -14,27 +14,26 @@
 //! well. This module is imported by default when `#![no_std]` is used in the
 //! same manner as the standard library's prelude.
 
-#![unstable(feature = "core_prelude",
-            reason = "the libcore prelude has not been scrutinized and \
-                      stabilized yet",
-            issue = "27701")]
+#![stable(feature = "core_prelude", since = "1.4.0")]
 
 // Reexported core operators
-pub use marker::{Copy, Send, Sized, Sync};
-pub use ops::{Drop, Fn, FnMut, FnOnce};
+#[doc(no_inline)] pub use marker::{Copy, Send, Sized, Sync};
+#[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce};
 
 // Reexported functions
-pub use mem::drop;
+#[doc(no_inline)] pub use mem::drop;
 
 // Reexported types and traits
-pub use char::CharExt;
-pub use clone::Clone;
-pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
-pub use convert::{AsRef, AsMut, Into, From};
-pub use default::Default;
-pub use iter::IntoIterator;
-pub use iter::{Iterator, DoubleEndedIterator, Extend, ExactSizeIterator};
-pub use option::Option::{self, Some, None};
-pub use result::Result::{self, Ok, Err};
-pub use slice::SliceExt;
-pub use str::StrExt;
+#[doc(no_inline)] pub use clone::Clone;
+#[doc(no_inline)] pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
+#[doc(no_inline)] pub use convert::{AsRef, AsMut, Into, From};
+#[doc(no_inline)] pub use default::Default;
+#[doc(no_inline)] pub use iter::{Iterator, Extend, IntoIterator};
+#[doc(no_inline)] pub use iter::{DoubleEndedIterator, ExactSizeIterator};
+#[doc(no_inline)] pub use option::Option::{self, Some, None};
+#[doc(no_inline)] pub use result::Result::{self, Ok, Err};
+
+// Reexported extension traits for primitive types
+#[doc(no_inline)] pub use slice::SliceExt;
+#[doc(no_inline)] pub use str::StrExt;
+#[doc(no_inline)] pub use char::CharExt;