From b6c4f63d9678585722f62009231d602547a2c0fe Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Wed, 29 Oct 2014 10:51:09 -0500
Subject: Fix build

Fixes breakage caused by rust-lang/rust#18229 and rust-lang/rust#18365
---
 src/gen.rs   |  4 ++--
 src/macro.rs | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gen.rs b/src/gen.rs
index 6ca32a8f..91c377a2 100644
--- a/src/gen.rs
+++ b/src/gen.rs
@@ -51,8 +51,8 @@ fn empty_generics() -> ast::Generics {
 }
 
 fn rust_id(ctx: &mut GenCtx, name: String) -> (String, bool) {
-    let token = parse::token::IDENT(ctx.ext_cx.ident_of(name.as_slice()), false);
-    if parse::token::is_any_keyword(&token) || "bool" == name.as_slice() {
+    let token = parse::token::Ident(ctx.ext_cx.ident_of(name.as_slice()), parse::token::Plain);
+    if token.is_any_keyword() || "bool" == name.as_slice() {
         let mut s = "_".to_string();
         s.push_str(name.as_slice());
         (s, true)
diff --git a/src/macro.rs b/src/macro.rs
index a0a5a8c7..f3817072 100644
--- a/src/macro.rs
+++ b/src/macro.rs
@@ -114,12 +114,12 @@ fn parse_macro_opts(cx: &mut base::ExtCtxt, tts: &[ast::TokenTree], visit: &mut
         let mut span = parser.span;
 
         // Check for [ident=]value and if found save ident to name
-        if parser.look_ahead(1, |t| t == &token::EQ) {
+        if parser.look_ahead(1, |t| t == &token::Eq) {
             match parser.bump_and_get() {
-                token::IDENT(ident, _) => {
+                token::Ident(ident, _) => {
                     let ident = parser.id_to_interned_str(ident);
                     name = Some(ident.get().to_string());
-                    parser.expect(&token::EQ);
+                    parser.expect(&token::Eq);
                 },
                 _ => {
                     cx.span_err(span, "invalid argument format");
@@ -130,7 +130,7 @@ fn parse_macro_opts(cx: &mut base::ExtCtxt, tts: &[ast::TokenTree], visit: &mut
 
         match parser.token {
             // Match [ident]
-            token::IDENT(val, _) => {
+            token::Ident(val, _) => {
                 let val = parser.id_to_interned_str(val);
                 span.hi = parser.span.hi;
                 parser.bump();
@@ -180,11 +180,11 @@ fn parse_macro_opts(cx: &mut base::ExtCtxt, tts: &[ast::TokenTree], visit: &mut
             }
         }
 
-        if parser.eat(&token::EOF) {
+        if parser.eat(&token::Eof) {
             return args_good
         }
 
-        if !parser.eat(&token::COMMA) {
+        if !parser.eat(&token::Comma) {
             cx.span_err(parser.span, "invalid argument format");
             return false
         }
-- 
cgit v1.2.3