From 9bd870597fb26a109a4f33926a299729c00aea10 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 11 Feb 2015 11:32:34 -0800
Subject: [PATCH] Fix for upstream changse

---
 README.md              | 3 +--
 phf/src/map.rs         | 6 +++---
 phf/src/ordered_map.rs | 6 +++---
 phf/src/ordered_set.rs | 6 +++---
 phf/src/set.rs         | 6 +++---
 phf/tests/test.rs      | 3 +--
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index d22aa961..a6072c70 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,8 @@ Example
 
 ```rust
 #![feature(plugin)]
+#![plugin(phf_macros)]
 
-#[plugin] #[no_link]
-extern crate phf_macros;
 extern crate phf;
 
 #[derive(Clone)]
diff --git a/phf/src/map.rs b/phf/src/map.rs
index 8d2cc8eb..f5753c0e 100644
--- a/phf/src/map.rs
+++ b/phf/src/map.rs
@@ -14,9 +14,9 @@ use phf_shared;
 ///
 /// ```rust
 /// #![feature(plugin)]
+/// #![plugin(phf_macros)]
+///
 /// extern crate phf;
-/// #[plugin] #[no_link]
-/// extern crate phf_macros;
 ///
 /// static MY_MAP: phf::Map<&'static str, isize> = phf_map! {
 ///    "hello" => 10,
@@ -130,7 +130,7 @@ impl<K, V> Map<K, V> {
 }
 
 impl<'a, K, V> IntoIterator for &'a Map<K, V> {
-    type Iter = Entries<'a, K, V>;
+    type IntoIter = Entries<'a, K, V>;
 
     fn into_iter(self) -> Entries<'a, K, V> {
         self.entries()
diff --git a/phf/src/ordered_map.rs b/phf/src/ordered_map.rs
index dd3be1d4..7d77e2b7 100644
--- a/phf/src/ordered_map.rs
+++ b/phf/src/ordered_map.rs
@@ -18,9 +18,9 @@ use phf_shared;
 ///
 /// ```rust
 /// #![feature(plugin)]
+/// #![plugin(phf_macros)]
+///
 /// extern crate phf;
-/// #[plugin] #[no_link]
-/// extern crate phf_macros;
 ///
 /// static MY_MAP: phf::OrderedMap<&'static str, isize> = phf_ordered_map! {
 ///    "hello" => 10,
@@ -149,7 +149,7 @@ impl<K, V> OrderedMap<K, V> {
 }
 
 impl<'a, K, V> IntoIterator for &'a OrderedMap<K, V> {
-    type Iter = Entries<'a, K, V>;
+    type IntoIter = Entries<'a, K, V>;
 
     fn into_iter(self) -> Entries<'a, K, V> {
         self.entries()
diff --git a/phf/src/ordered_set.rs b/phf/src/ordered_set.rs
index 31286a85..8389884e 100644
--- a/phf/src/ordered_set.rs
+++ b/phf/src/ordered_set.rs
@@ -15,9 +15,9 @@ use {PhfHash, OrderedMap};
 ///
 /// ```rust
 /// #![feature(plugin)]
+/// #![plugin(phf_macros)]
+///
 /// extern crate phf;
-/// #[plugin] #[no_link]
-/// extern crate phf_macros;
 ///
 /// static MY_SET: phf::OrderedSet<&'static str> = phf_ordered_set! {
 ///    "hello",
@@ -112,7 +112,7 @@ impl<T> OrderedSet<T> where T: Eq + PhfHash {
 }
 
 impl<'a, T> IntoIterator for &'a OrderedSet<T> {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
diff --git a/phf/src/set.rs b/phf/src/set.rs
index ff220382..fedc8339 100644
--- a/phf/src/set.rs
+++ b/phf/src/set.rs
@@ -14,9 +14,9 @@ use Map;
 ///
 /// ```rust
 /// #![feature(plugin)]
+/// #![plugin(phf_macros)]
+///
 /// extern crate phf;
-/// #[plugin] #[no_link]
-/// extern crate phf_macros;
 ///
 /// static MY_SET: phf::Set<&'static str> = phf_set! {
 ///    "hello",
@@ -101,7 +101,7 @@ impl<T> Set<T> where T: Eq + PhfHash {
 }
 
 impl<'a, T> IntoIterator for &'a Set<T> {
-    type Iter = Iter<'a, T>;
+    type IntoIter = Iter<'a, T>;
 
     fn into_iter(self) -> Iter<'a, T> {
         self.iter()
diff --git a/phf/tests/test.rs b/phf/tests/test.rs
index 1e164e3f..5f41b0e0 100644
--- a/phf/tests/test.rs
+++ b/phf/tests/test.rs
@@ -1,7 +1,6 @@
 #![feature(plugin, core)]
+#![plugin(phf_macros)]
 
-#[plugin] #[no_link]
-extern crate phf_macros;
 extern crate phf;
 
 mod map {