diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:59:14 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 16:17:24 -0700 |
| commit | 224fc1085b96e6a497ed7d1bb47ef6f49674202b (patch) | |
| tree | aaa36f5462dfe299902c6829795a8a8988f3061e /src/libcollections | |
| parent | a1dd5ac78745a9f266573d539ba34bbd75b50277 (diff) | |
| download | rust-224fc1085b96e6a497ed7d1bb47ef6f49674202b.tar.gz rust-224fc1085b96e6a497ed7d1bb47ef6f49674202b.zip | |
Test fixes and rebase conflicts, round 1
Diffstat (limited to 'src/libcollections')
| -rw-r--r-- | src/libcollections/string.rs | 1 | ||||
| -rw-r--r-- | src/libcollections/vec.rs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 420fc9f59b0..a37a26ef22a 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -21,7 +21,6 @@ use core::mem; use core::ops::{self, Deref, Add, Index}; use core::ptr; use core::slice; -#[allow(deprecated)] use core::str::Str; use core::str::pattern::Pattern; use rustc_unicode::str as unicode_str; use rustc_unicode::str::Utf16Item; diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 4bbfabdd72f..526150915a7 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -63,7 +63,7 @@ use core::ops::{Index, IndexMut, Deref, Add}; use core::ops; use core::ptr; use core::ptr::Unique; -use core::slice::{self, AsSlice}; +use core::slice; use core::isize; use core::usize; |