---

paulstansifer · graydon · commit 085954864323 · 2012-11-29T12:09:10.000-08:00
yaml --- r: 36477 b: refs/heads/try2 c: cafea5e h: refs/heads/master i: 36475: b9d5a95 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9845a4be5a4f9919fcadfb1076d2425781eab41f
+refs/heads/try2: cafea5ecb69ad9439502426a69e5d297c4525758
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/libsyntax/ext/expand.rs b/branches/try2/src/libsyntax/ext/expand.rs
@@ -225,8 +225,8 @@ fn expand_item_mac(exts: HashMap<~str, syntax_extension>,
             cx.bt_pop();
             return maybe_it
           }
-          _ => cx.span_fatal(it.span,
-                            fmt!("%s is not a legal here", *extname))
+          _ => cx.span_fatal(
+              it.span, fmt!("%s! is not legal in item position", *extname))
         }
       }
       _ => cx.span_bug(it.span, ~"invalid item macro invocation")

Original file line number	Diff line number	Diff line change
`@@ -225,8 +225,8 @@ fn expand_item_mac(exts: HashMap<~str, syntax_extension>,`
`225`	`225`	`cx.bt_pop();`
`226`	`226`	`return maybe_it`
`227`	`227`	`}`
`228`		`- _ => cx.span_fatal(it.span,`
`229`		`- fmt!("%s is not a legal here", *extname))`
	`228`	`+ _ => cx.span_fatal(`
	`229`	`+ it.span, fmt!("%s! is not legal in item position", *extname))`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`_ => cx.span_bug(it.span, ~"invalid item macro invocation")`