about summary refs log tree commit diff
path: root/src/libcore
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/libcore
parent16c27bf713ac7c0afeada808e274c73e10eb96bd (diff)
parenteadda7665eb31b1e7cb94a503b4d5cf5c75474c0 (diff)
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/libcore')
-rw-r--r--src/libcore/str/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 34aca592b1e..c374f400974 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -2015,7 +2015,7 @@ mod traits {
            issue = "32110")]
 pub trait StrExt {
     // NB there are no docs here are they're all located on the StrExt trait in
-    // libcollections, not here.
+    // liballoc, not here.
 
     #[stable(feature = "core", since = "1.6.0")]
     fn contains<'a, P: Pattern<'a>>(&'a self, pat: P) -> bool;