From 69ca376dc8daa094ab16f1fcbadb65f83a75939b Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 31 Jan 2015 17:55:49 -0800
Subject: [PATCH] Fix for upstream changes

---
 phf/src/lib.rs    | 2 ++
 phf/tests/test.rs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/phf/src/lib.rs b/phf/src/lib.rs
index 86d26da2..400a64ea 100644
--- a/phf/src/lib.rs
+++ b/phf/src/lib.rs
@@ -28,5 +28,7 @@ pub mod ordered_set;
 
 mod std {
     pub use core::fmt;
+    pub use core::iter;
+    pub use core::option;
 }
 
diff --git a/phf/tests/test.rs b/phf/tests/test.rs
index 35cd893f..7461a090 100644
--- a/phf/tests/test.rs
+++ b/phf/tests/test.rs
@@ -1,4 +1,4 @@
-#![feature(plugin, collections, core)]
+#![feature(plugin, core)]
 
 #[plugin] #[no_link]
 extern crate phf_macros;