From 4a0d48d165d78d1b3e8f791503e220a032d26d24 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 23 Dec 2014 08:20:27 -0800
Subject: [PATCH] Update to rust master

---
 phf/src/map.rs         | 2 +-
 phf/src/ordered_map.rs | 2 +-
 phf_shared/src/lib.rs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phf/src/map.rs b/phf/src/map.rs
index 206277ae..b32a35e4 100644
--- 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
index a7113129..b2793346 100644
--- 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
index aabf932f..09a2b070 100644
--- 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;