---

yaml
---
r: 193827
b: refs/heads/beta
c: b2f3755
h: refs/heads/master
i:
  193825: 0616b90
  193823: 07029ac
v: v3

Author: Jorge Aparicio

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 85707398809f8b56afc471f228bd4d0137ce0a32
+refs/heads/beta: b2f37554bf9f2b55fa6ba6ba8e8eaf1826301b4e
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/src/libcollections/lib.rs

@@ -166,7 +166,6 @@ mod prelude {
 
     // from other crates.
     pub use alloc::boxed::Box;
-    pub use unicode::char::CharExt;
 
     // from collections.
     pub use borrow::IntoCow;

branches/beta/src/libstd/num/strconv.rs

@@ -16,7 +16,10 @@ use self::ExponentFormat::*;
 use self::SignificantDigits::*;
 use self::SignFormat::*;
 
+#[cfg(stage0)]
 use char::{self, CharExt};
+#[cfg(not(stage0))]
+use char;
 use num::{self, Int, Float, ToPrimitive};
 use num::FpCategory as Fp;
 use ops::FnMut;

branches/beta/src/libstd/old_io/mod.rs

@@ -251,6 +251,7 @@ pub use self::FileMode::*;
 pub use self::FileAccess::*;
 pub use self::IoErrorKind::*;
 
+#[cfg(stage0)]
 use char::CharExt;
 use default::Default;
 use error::Error;

branches/beta/src/libstd/old_path/windows.rs

@@ -15,6 +15,7 @@
 use self::PathPrefix::*;
 
 use ascii::AsciiExt;
+#[cfg(stage0)]
 use char::CharExt;
 use clone::Clone;
 use cmp::{Ordering, Eq, Ord, PartialEq, PartialOrd};

branches/beta/src/libstd/path.rs

@@ -159,6 +159,7 @@ mod platform {
     use core::prelude::*;
     use ascii::*;
 
+    #[cfg(stage0)]
     use char::CharExt as UnicodeCharExt;
     use super::{os_str_as_u8_slice, u8_slice_as_os_str, Prefix};
     use ffi::OsStr;

branches/beta/src/libstd/prelude/v1.rs

@@ -25,6 +25,7 @@
 // Reexported types and traits
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use boxed::Box;
+#[cfg(stage0)]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use char::CharExt;
 #[stable(feature = "rust1", since = "1.0.0")]