From 3db7cef414e4de28eb6c18938c275a3aafbdafa4 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 8 Feb 2015 10:40:39 -0800
Subject: [PATCH] Fix for upstream changes

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

diff --git a/phf/src/lib.rs b/phf/src/lib.rs
index 41d0a435..b8d5f1d7 100644
--- a/phf/src/lib.rs
+++ b/phf/src/lib.rs
@@ -3,7 +3,7 @@
 //! Keys can be string literals, byte string literals, byte literals, char
 //! literals, or any of the fixed-size isizeegral types.
 #![doc(html_root_url="https://sfackler.github.io/rust-phf/doc")]
-#![feature(core)]
+#![feature(core, no_std)]
 #![warn(missing_docs)]
 #![no_std]
 
@@ -38,3 +38,7 @@ mod std {
     }
 }
 
+#[cfg(not(feature = "core"))]
+mod core {
+    pub use std::{fmt, option, iter};
+}
diff --git a/phf_shared/src/lib.rs b/phf_shared/src/lib.rs
index ac0711b8..3d86260b 100644
--- a/phf_shared/src/lib.rs
+++ b/phf_shared/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(hash)]
+#![feature(hash, no_std)]
 #![cfg_attr(feature = "core", feature(core))]
 #![no_std]
 #![doc(html_root_url="http://sfackler.github.io/rust-phf/doc")]