Update to rust master

rust-phf · Dec 23, 2014 · 4a0d48d · 4a0d48d
1 parent 0fba837
commit 4a0d48d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/phf/src/map.rs b/phf/src/map.rs
@@ -126,7 +126,7 @@ impl<K, V> Map<K, V> {
 
 /// An iterator over the key/value pairs in a `Map`.
 pub struct Entries<'a, K:'a, V:'a> {
-    iter: slice::Items<'a, (K, V)>,
+    iter: slice::Iter<'a, (K, V)>,
 }
 
 impl<'a, K, V> Iterator<(&'a K, &'a V)> for Entries<'a, K, V> {

diff --git a/phf/src/ordered_map.rs b/phf/src/ordered_map.rs
@@ -145,7 +145,7 @@ impl<K, V> OrderedMap<K, V> {
 
 /// An iterator over the entries in a `OrderedMap`.
 pub struct Entries<'a, K:'a, V:'a> {
-    iter: slice::Items<'a, (K, V)>,
+    iter: slice::Iter<'a, (K, V)>,
 }
 
 impl<'a, K, V> Iterator<(&'a K, &'a V)> for Entries<'a, K, V> {

diff --git a/phf_shared/src/lib.rs b/phf_shared/src/lib.rs
@@ -3,7 +3,7 @@
 extern crate core;
 
 use core::slice::AsSlice;
-use core::str::StrPrelude;
+use core::str::StrExt;
 use core::hash::Writer;
 use core::hash::sip::{mod, SipState};
 use core::kinds::Sized;