about summary refs log tree commit diff
path: root/src/libstd_unicode
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-15 12:37:54 +0000
committerbors <bors@rust-lang.org>2017-06-15 12:37:54 +0000
commit258ae6dd9b1a8ac97986852fc9f00f7687004ccb (patch)
tree96936d0ba5ed7f62d1603a5e765f11f203b136c1 /src/libstd_unicode
parent16c27bf713ac7c0afeada808e274c73e10eb96bd (diff)
parenteadda7665eb31b1e7cb94a503b4d5cf5c75474c0 (diff)
downloadrust-258ae6dd9b1a8ac97986852fc9f00f7687004ccb.tar.gz
rust-258ae6dd9b1a8ac97986852fc9f00f7687004ccb.zip
Auto merge of #42648 - murarth:merge-alloc-collections, r=alexcrichton
Merge crate `collections` into `alloc`

This is a necessary step in order to merge #42565
Diffstat (limited to 'src/libstd_unicode')
-rw-r--r--src/libstd_unicode/lib.rs2
-rw-r--r--src/libstd_unicode/u_str.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd_unicode/lib.rs b/src/libstd_unicode/lib.rs
index d63878a7a7c..19f2ad1c56f 100644
--- a/src/libstd_unicode/lib.rs
+++ b/src/libstd_unicode/lib.rs
@@ -52,7 +52,7 @@ pub mod str {
     pub use u_str::Utf16Encoder;
 }
 
-// For use in libcollections, not re-exported in libstd.
+// For use in liballoc, not re-exported in libstd.
 pub mod derived_property {
     pub use tables::derived_property::{Case_Ignorable, Cased};
 }
diff --git a/src/libstd_unicode/u_str.rs b/src/libstd_unicode/u_str.rs
index 1454168d2d5..54a5288a57c 100644
--- a/src/libstd_unicode/u_str.rs
+++ b/src/libstd_unicode/u_str.rs
@@ -32,7 +32,7 @@ pub struct SplitWhitespace<'a> {
 }
 
 /// Methods for Unicode string slices
-#[allow(missing_docs)] // docs in libcollections
+#[allow(missing_docs)] // docs in liballoc
 pub trait UnicodeStr {
     fn split_whitespace<'a>(&'a self) -> SplitWhitespace<'a>;
     fn is_whitespace(&self) -> bool;