From 6567152be9e018a99fedf6e54017d827812b8f13 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 1 Mar 2015 23:26:48 -0800
Subject: [PATCH] Fix phf_macros

---
 phf_macros/src/lib.rs  |  2 +-
 phf_macros/src/util.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phf_macros/src/lib.rs b/phf_macros/src/lib.rs
index c65801f7..edc382f0 100644
--- a/phf_macros/src/lib.rs
+++ b/phf_macros/src/lib.rs
@@ -31,7 +31,7 @@
 //! # fn main() {}
 //! ```
 #![doc(html_root_url="http://sfackler.github.io/rust-phf/doc")]
-#![feature(plugin_registrar, quote, rustc_private, env, std_misc)]
+#![feature(plugin_registrar, quote, rustc_private, std_misc)]
 
 extern crate syntax;
 #[cfg(feature = "stats")]
diff --git a/phf_macros/src/util.rs b/phf_macros/src/util.rs
index ed11b93c..431e6e55 100644
--- a/phf_macros/src/util.rs
+++ b/phf_macros/src/util.rs
@@ -3,7 +3,7 @@ use std::hash::{Hash, Hasher};
 
 use syntax::ast::Expr;
 use syntax::codemap::Span;
-use syntax::ext::base::{ExtCtxt, MacResult, MacExpr};
+use syntax::ext::base::{ExtCtxt, MacResult, MacEager};
 use syntax::ext::build::AstBuilder;
 use syntax::parse::token::InternedString;
 use syntax::ptr::P;
@@ -91,7 +91,7 @@ pub fn create_map(cx: &mut ExtCtxt, sp: Span, entries: Vec<Entry>, state: HashSt
     let entries = cx.expr_vec(sp, entries);
 
     let key = state.key;
-    MacExpr::new(quote_expr!(cx, ::phf::Map {
+    MacEager::expr(quote_expr!(cx, ::phf::Map {
         key: $key,
         disps: &$disps,
         entries: &$entries,
@@ -101,7 +101,7 @@ pub fn create_map(cx: &mut ExtCtxt, sp: Span, entries: Vec<Entry>, state: HashSt
 pub fn create_set(cx: &mut ExtCtxt, sp: Span, entries: Vec<Entry>, state: HashState)
               -> Box<MacResult+'static> {
     let map = create_map(cx, sp, entries, state).make_expr().unwrap();
-    MacExpr::new(quote_expr!(cx, ::phf::Set { map: $map }))
+    MacEager::expr(quote_expr!(cx, ::phf::Set { map: $map }))
 }
 
 pub fn create_ordered_map(cx: &mut ExtCtxt, sp: Span, entries: Vec<Entry>, state: HashState)
@@ -120,7 +120,7 @@ pub fn create_ordered_map(cx: &mut ExtCtxt, sp: Span, entries: Vec<Entry>, state
     let entries = cx.expr_vec(sp, entries);
 
     let key = state.key;
-    MacExpr::new(quote_expr!(cx, ::phf::OrderedMap {
+    MacEager::expr(quote_expr!(cx, ::phf::OrderedMap {
         key: $key,
         disps: &$disps,
         idxs: &$idxs,
@@ -131,5 +131,5 @@ pub fn create_ordered_map(cx: &mut ExtCtxt, sp: Span, entries: Vec<Entry>, state
 pub fn create_ordered_set(cx: &mut ExtCtxt, sp: Span, entries: Vec<Entry>, state: HashState)
                           -> Box<MacResult+'static> {
     let map = create_ordered_map(cx, sp, entries, state).make_expr().unwrap();
-    MacExpr::new(quote_expr!(cx, ::phf::OrderedSet { map: $map }))
+    MacEager::expr(quote_expr!(cx, ::phf::OrderedSet { map: $map }))
 }