---

yaml
---
r: 79335
b: refs/heads/try
c: 3ea70e9
h: refs/heads/master
i:
  79333: eff975f
  79331: fd6636d
  79327: b551c56
v: v3

Author: jbclements

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e6de6b7da8ee88bf84b0e217900051334be08da
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
-refs/heads/try: 079b313854df733c52955454a739ee50a478c22d
+refs/heads/try: 3ea70e900f7b63ca026d137362951088b7b5ece5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/ext/expand.rs

@@ -385,7 +385,7 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv,
                               fmt!("macro undefined: '%s!'", extnamestr)),
 
         Some(@SE(NormalTT(expander, span))) => {
-            if it.ident != parse::token::special_idents::invalid {
+            if it.ident.name != parse::token::special_idents::invalid.name {
                 cx.span_fatal(pth.span,
                               fmt!("macro %s! expects no ident argument, \
                                     given '%s'", extnamestr,
@@ -401,7 +401,7 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv,
              expander(cx, it.span, tts)
         }
         Some(@SE(IdentTT(expander, span))) => {
-            if it.ident == parse::token::special_idents::invalid {
+            if it.ident.name == parse::token::special_idents::invalid.name {
                 cx.span_fatal(pth.span,
                               fmt!("macro %s! expects an ident argument",
                                    extnamestr));