about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-01-05 06:45:39 +0000
committerbors <bors@rust-lang.org>2015-01-05 06:45:39 +0000
commit1f732ef53d54ccfc3e7728390ffbcea8a696ecee (patch)
tree29ced952bc9e6f49640ccc33974209afc805ff91 /src/libstd/io
parented22606c8382822efc555f72f895c560289a5c70 (diff)
parent990a79f097e8e74308bfec6d72dcdbb769a7973b (diff)
downloadrust-1f732ef53d54ccfc3e7728390ffbcea8a696ecee.tar.gz
rust-1f732ef53d54ccfc3e7728390ffbcea8a696ecee.zip
auto merge of #20395 : huonw/rust/char-stab-2, r=aturon
cc #19260 

The casing transformations are left unstable (it is highly likely to be better to adopt the proper non-1-to-1 case mappings, per #20333) as are `is_xid_*`.

I've got a little todo list in the last commit of things I thought about/was told about that I haven't yet handled (I'd also like some feedback).
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/mod.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index ae401a04a96..3fa0b5645c5 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -225,7 +225,7 @@ pub use self::FileMode::*;
 pub use self::FileAccess::*;
 pub use self::IoErrorKind::*;
 
-use char::Char;
+use char::CharExt;
 use clone::Clone;
 use default::Default;
 use error::{FromError, Error};
@@ -248,7 +248,6 @@ use str;
 use string::String;
 use uint;
 use unicode;
-use unicode::char::UnicodeChar;
 use vec::Vec;
 
 // Reexports