---

yaml
---
r: 229195
b: refs/heads/try
c: ac085a6
h: refs/heads/master
i:
  229193: 465dbf1
  229191: 06b8c49
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 6a3545ef055a6c3b46593c2b17512486dc3fa0ee
+refs/heads/try: ac085a6a9ea58f0a7f6e44618c6789c5053dd98b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/mk/main.mk

@@ -13,7 +13,7 @@
 ######################################################################
 
 # The version number
-CFG_RELEASE_NUM=1.3.0
+CFG_RELEASE_NUM=1.4.0
 
 # An optional number to put after the label, e.g. '.2' -> '-beta.2'
 # NB Make sure it starts with a dot to conform to semver pre-release

branches/try/src/liballoc/arc.rs

@@ -71,8 +71,7 @@
 
 use boxed::Box;
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::atomic;
 use core::atomic::Ordering::{Relaxed, Release, Acquire, SeqCst};

branches/try/src/liballoc/boxed.rs

@@ -53,8 +53,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use heap;
 use raw_vec::RawVec;

branches/try/src/liballoc/lib.rs

@@ -75,6 +75,7 @@
 #![feature(coerce_unsized)]
 #![feature(core)]
 #![feature(core_intrinsics)]
+#![feature(core_prelude)]
 #![feature(core_slice_ext)]
 #![feature(custom_attribute)]
 #![feature(fundamental)]
@@ -92,17 +93,17 @@
 #![feature(unsize)]
 #![feature(core_slice_ext)]
 #![feature(core_str_ext)]
-#![cfg_attr(stage0, feature(core, core_prelude))]
 
 #![cfg_attr(test, feature(test, alloc, rustc_private, box_raw))]
 #![cfg_attr(all(not(feature = "external_funcs"), not(feature = "external_crate")),
             feature(libc))]
 
+#[macro_use]
+extern crate core;
+
 #[cfg(all(not(feature = "external_funcs"), not(feature = "external_crate")))]
 extern crate libc;
 
-#[cfg(stage0)] #[macro_use] extern crate core;
-
 // Allow testing this library
 
 #[cfg(test)] #[macro_use] extern crate std;

branches/try/src/liballoc/rc.rs

@@ -150,8 +150,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 #[cfg(not(test))]
 use boxed::Box;

branches/try/src/libcollections/binary_heap.rs

@@ -151,8 +151,7 @@
 #![allow(missing_docs)]
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::iter::{FromIterator};
 use core::mem::swap;

branches/try/src/libcollections/bit.rs

@@ -86,8 +86,7 @@
 //! println!("There are {} primes below {}", num_primes, max_prime);
 //! ```
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::cmp::Ordering;
 use core::cmp;

branches/try/src/libcollections/btree/map.rs

@@ -17,8 +17,7 @@
 
 use self::Entry::*;
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::cmp::Ordering;
 use core::fmt::Debug;
@@ -531,8 +530,7 @@ enum Continuation<A, B> {
 /// to nodes. By using this module much better safety guarantees can be made, and more search
 /// boilerplate gets cut out.
 mod stack {
-    #[cfg(stage0)]
-    use core::prelude::v1::*;
+    use core::prelude::*;
     use core::marker;
     use core::mem;
     use core::ops::{Deref, DerefMut};

branches/try/src/libcollections/btree/node.rs

@@ -16,8 +16,7 @@ pub use self::SearchResult::*;
 pub use self::ForceResult::*;
 pub use self::TraversalItem::*;
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::cmp::Ordering::{Greater, Less, Equal};
 use core::intrinsics::arith_offset;

branches/try/src/libcollections/btree/set.rs

@@ -11,8 +11,7 @@
 // This is pretty much entirely stolen from TreeSet, since BTreeMap has an identical interface
 // to TreeMap
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::cmp::Ordering::{self, Less, Greater, Equal};
 use core::fmt::Debug;

branches/try/src/libcollections/enum_set.rs

@@ -17,9 +17,7 @@
             reason = "matches collection reform specification, \
                       waiting for dust to settle")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
-
+use core::prelude::*;
 use core::marker;
 use core::fmt;
 use core::iter::{FromIterator};

branches/try/src/libcollections/lib.rs

@@ -33,7 +33,9 @@
 #![feature(alloc)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
+#![feature(core)]
 #![feature(core_intrinsics)]
+#![feature(core_prelude)]
 #![feature(core_slice_ext)]
 #![feature(core_str_ext)]
 #![feature(heap_api)]
@@ -60,12 +62,12 @@
 #![feature(utf8_error)]
 #![cfg_attr(test, feature(rand, test))]
 #![cfg_attr(not(test), feature(str_words))]
-#![cfg_attr(stage0, feature(core, core_prelude))]
 
 #![feature(no_std)]
 #![no_std]
 
-#[cfg(stage0)] #[macro_use] extern crate core;
+#[macro_use]
+extern crate core;
 
 extern crate rustc_unicode;
 extern crate alloc;

branches/try/src/libcollections/linked_list.rs

@@ -21,8 +21,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use alloc::boxed::Box;
 use core::cmp::Ordering;

branches/try/src/libcollections/string.rs

@@ -12,8 +12,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::fmt;
 use core::hash;

branches/try/src/libcollections/vec.rs

@@ -58,9 +58,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
-
+use core::prelude::*;
 use alloc::raw_vec::RawVec;
 use alloc::boxed::Box;
 use alloc::heap::EMPTY;

branches/try/src/libcollections/vec_deque.rs

@@ -18,8 +18,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::cmp::Ordering;
 use core::fmt;

branches/try/src/libcollections/vec_map.rs

@@ -20,8 +20,7 @@
 
 use self::Entry::*;
 
-#[cfg(stage0)]
-use core::prelude::v1::*;
+use core::prelude::*;
 
 use core::cmp::{max, Ordering};
 use core::fmt;

branches/try/src/libcore/fmt/builders.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use prelude::v1::*;
+use prelude::*;
 use fmt::{self, Write, FlagV1};
 
 struct PadAdapter<'a, 'b: 'a> {

branches/try/src/libcore/fmt/mod.rs

@@ -12,7 +12,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-use prelude::v1::*;
+use prelude::*;
 
 use cell::{Cell, RefCell, Ref, RefMut, BorrowState};
 use marker::PhantomData;

branches/try/src/libcore/fmt/num.rs

@@ -12,7 +12,7 @@
 
 // FIXME: #6220 Implement floating point formatting
 
-use prelude::v1::*;
+use prelude::*;
 
 use fmt;
 use num::Zero;

branches/try/src/libcore/hash/mod.rs

@@ -62,7 +62,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-use prelude::v1::*;
+use prelude::*;
 
 use mem;
 
@@ -183,7 +183,7 @@ pub fn hash<T: Hash, H: Hasher + Default>(value: &T) -> u64 {
 //////////////////////////////////////////////////////////////////////////////
 
 mod impls {
-    use prelude::v1::*;
+    use prelude::*;
 
     use slice;
     use super::*;

branches/try/src/libcore/hash/sip.rs

@@ -10,9 +10,8 @@
 
 //! An implementation of SipHash 2-4.
 
-use prelude::v1::*;
-
 use ptr;
+use prelude::*;
 use super::Hasher;
 
 /// An implementation of SipHash 2-4.

branches/try/src/libcore/lib.rs

@@ -60,10 +60,8 @@
        html_playground_url = "http://play.rust-lang.org/")]
 #![doc(test(no_crate_inject))]
 
-#![cfg_attr(stage0, feature(no_std))]
-#![cfg_attr(stage0, no_std)]
-#![cfg_attr(not(stage0), feature(no_core))]
-#![cfg_attr(not(stage0), no_core)]
+#![feature(no_std)]
+#![no_std]
 #![allow(raw_pointer_derive)]
 #![deny(missing_docs)]
 
@@ -170,7 +168,6 @@ mod tuple;
 // compiling the core library when it's compiling this library, so it expands
 // all references to `::core::$foo`
 #[doc(hidden)]
-#[cfg(stage0)]
 mod core {
     pub use intrinsics;     // derive(PartialOrd)
     pub use fmt;            // format_args!

branches/try/src/libcore/num/f32.rs

@@ -15,7 +15,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-use prelude::v1::*;
+use prelude::*;
 
 use intrinsics;
 use mem;

branches/try/src/libcore/num/f64.rs

@@ -15,7 +15,7 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-use prelude::v1::*;
+use prelude::*;
 
 use intrinsics;
 use mem;

branches/try/src/libcore/num/flt2dec/bignum.rs

@@ -21,8 +21,7 @@
 
 #![macro_use]
 
-use prelude::v1::*;
-
+use prelude::*;
 use mem;
 use intrinsics;
 
@@ -352,7 +351,7 @@ define_bignum!(Big32x36: type=Digit32, n=36);
 // this one is used for testing only.
 #[doc(hidden)]
 pub mod tests {
-    use prelude::v1::*;
+    use prelude::*;
     define_bignum!(Big8x3: type=u8, n=3);
 }
 

branches/try/src/libcore/num/flt2dec/decoder.rs

@@ -10,7 +10,7 @@
 
 //! Decodes a floating-point value into individual parts and error ranges.
 
-use prelude::v1::*;
+use prelude::*;
 
 use {f32, f64};
 use num::{Float, FpCategory};

branches/try/src/libcore/num/flt2dec/mod.rs

@@ -129,7 +129,7 @@ functions.
 #![unstable(feature = "flt2dec",
             reason = "internal routines only exposed for testing")]
 
-use prelude::v1::*;
+use prelude::*;
 use i16;
 use num::Float;
 use slice::bytes;

branches/try/src/libcore/num/flt2dec/strategy/dragon.rs

@@ -15,8 +15,7 @@ Almost direct (but slightly optimized) Rust translation of Figure 3 of [1].
     quickly and accurately. SIGPLAN Not. 31, 5 (May. 1996), 108-116.
 */
 
-use prelude::v1::*;
-
+use prelude::*;
 use num::Float;
 use cmp::Ordering;
 

branches/try/src/libcore/num/flt2dec/strategy/grisu.rs

@@ -16,8 +16,7 @@ Rust adaptation of Grisu3 algorithm described in [1]. It uses about
     accurately with integers. SIGPLAN Not. 45, 6 (June 2010), 233-243.
 */
 
-use prelude::v1::*;
-
+use prelude::*;
 use num::Float;
 
 use num::flt2dec::{Decoded, MAX_SIG_DIGITS, round_up};

branches/try/src/libcore/prelude/v1.rs renamed to branches/try/src/libcore/prelude.rs

@@ -11,8 +11,18 @@
 //! The core prelude
 //!
 //! This module is intended for users of libcore which do not link to libstd as
-//! well. This module is imported by default when `#![no_std]` is used in the
-//! same manner as the standard library's prelude.
+//! well. This module is not imported by default, but using the entire contents
+//! of this module will provide all of the useful traits and types in libcore
+//! that one would expect from the standard library as well.
+//!
+//! There is no method to automatically inject this prelude, and this prelude is
+//! a subset of the standard library's prelude.
+//!
+//! # Example
+//!
+//! ```ignore
+//! use core::prelude::*;
+//! ```
 
 #![unstable(feature = "core_prelude",
             reason = "the libcore prelude has not been scrutinized and \