---

yaml
---
r: 48439
b: refs/heads/snap-stage3
c: deaf3fd
h: refs/heads/master
i:
  48437: 2d227b1
  48435: 4cb23dd
  48431: 7074b50
v: v3

Author: bstrie

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: fe08364b3be5463e28650a6ed8cdd203b775208a
+refs/heads/snap-stage3: deaf3fdf6e5f4b0f8c5e0680f06a4d5809a034fb
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/ext/expand.rs

@@ -38,14 +38,10 @@ pub fn expand_expr(extsbox: @mut SyntaxEnv,
         // entry-point for all syntax extensions.
         expr_mac(ref mac) => {
             match (*mac).node {
-                // Token-tree macros:
+                // Token-tree macros, these will be the only case when we're
+                // finished transitioning.
                 mac_invoc_tt(pth, ref tts) => {
-                    if (pth.idents.len() > 1u) {
-                        cx.span_fatal(
-                            pth.span,
-                            fmt!("expected macro name without module \
-                                  separators"));
-                    }
+                    assert (vec::len(pth.idents) == 1u);
                     /* using idents and token::special_idents would make the
                     the macro names be hygienic */
                     let extname = cx.parse_sess().interner.get(pth.idents[0]);
@@ -324,12 +320,8 @@ pub fn expand_stmt(extsbox: @mut SyntaxEnv,
         }
         _ => return orig(s, sp, fld)
     };
-    if (pth.idents.len() > 1u) {
-        cx.span_fatal(
-            pth.span,
-            fmt!("expected macro name without module \
-                  separators"));
-    }
+
+    assert(vec::len(pth.idents) == 1u);
     let extname = cx.parse_sess().interner.get(pth.idents[0]);
     let (fully_expanded, sp) = match (*extsbox).find(&extname) {
         None =>

branches/snap-stage3/src/test/compile-fail/macro-with-seps-err-msg.rs renamed to branches/snap-stage3/src/test/run-pass/issue-4448.rs

@@ -8,10 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:expected macro name without module separators
-
 fn main() {
-    globnar::brotz!();
-}
+    let (port, chan) = comm::stream::<&static/str>();
 
+    do task::spawn {
+        assert port.recv() == "hello, world";
+    }
 
+    chan.send("hello, world");
+}