diff options
| author | bors <bors@rust-lang.org> | 2018-04-14 13:11:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-14 13:11:24 +0000 |
| commit | 21dae950bebab7376d2bcb92299861e6cd05299d (patch) | |
| tree | 321aff4a41151ac452434bec0483b2a15b5f58c3 /src/liballoc/string.rs | |
| parent | cfc3465b9d3eac25c0511fd5e99c9f342a494411 (diff) | |
| parent | 0e9d6f9bb0ed675c82c30ca6a3227731f2facf6a (diff) | |
| download | rust-21dae950bebab7376d2bcb92299861e6cd05299d.tar.gz rust-21dae950bebab7376d2bcb92299861e6cd05299d.zip | |
Auto merge of #49939 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests Successful merges: #49908, #49876, #49916, #49951, #49465, #49922, #49866, #49915, #49886, #49913, #49852, #49958, #49871, #49864 Failed merges:
Diffstat (limited to 'src/liballoc/string.rs')
| -rw-r--r-- | src/liballoc/string.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 29d759b1f00..0924ca24791 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -66,11 +66,11 @@ use core::ptr; use core::str::pattern::Pattern; use core::str::lossy; +use alloc::CollectionAllocErr; use borrow::{Cow, ToOwned}; +use boxed::Box; use str::{self, from_boxed_utf8_unchecked, FromStr, Utf8Error, Chars}; use vec::Vec; -use boxed::Box; -use super::allocator::CollectionAllocErr; /// A UTF-8 encoded, growable string. /// |