about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-12 13:19:33 +0000
committerbors <bors@rust-lang.org>2016-12-12 13:19:33 +0000
commitb4b1e5ece21fb497877350c3d6defa143c88076c (patch)
treeea9fb5fbf9239b9e3275f4a13fcfe11ea8bdd191 /src/libstd
parent0eae43e4d00ca6697da59b84c7cdf1c8ea83ea00 (diff)
parent274777a1588660b11a278ef52366743d82eb63ab (diff)
Auto merge of #38049 - frewsxcv:libunicode, r=alexcrichton
Rename 'librustc_unicode' crate to 'libstd_unicode'.

Fixes https://github.com/rust-lang/rust/issues/26554.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/Cargo.toml2
-rw-r--r--src/libstd/io/mod.rs2
-rw-r--r--src/libstd/lib.rs4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index b9f52e20fdd..fcf84cb7169 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -20,7 +20,7 @@ core = { path = "../libcore" }
 libc = { path = "../rustc/libc_shim" }
 rand = { path = "../librand" }
 compiler_builtins = { path = "../libcompiler_builtins" }
-rustc_unicode = { path = "../librustc_unicode" }
+std_unicode = { path = "../libstd_unicode" }
 unwind = { path = "../libunwind" }
 
 [build-dependencies]
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index ad9ae5638b6..b3b89213df1 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -256,7 +256,7 @@
 #![stable(feature = "rust1", since = "1.0.0")]
 
 use cmp;
-use rustc_unicode::str as core_str;
+use std_unicode::str as core_str;
 use error as std_error;
 use fmt;
 use result;
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 1f40d3fd1d3..414f25fa5eb 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -323,7 +323,7 @@ extern crate collections as core_collections;
 
 #[allow(deprecated)] extern crate rand as core_rand;
 extern crate alloc;
-extern crate rustc_unicode;
+extern crate std_unicode;
 extern crate libc;
 
 // We always need an unwinder currently for backtraces
@@ -420,7 +420,7 @@ pub use core_collections::string;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core_collections::vec;
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use rustc_unicode::char;
+pub use std_unicode::char;
 
 pub mod f32;
 pub mod f64;