---

yaml
---
r: 148200
b: refs/heads/try2
c: cdc4494
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 60e096a43fcf9df04e4bf38fe3de1d4a1f75ee87
+refs/heads/try2: cdc44940b73e3d1b10675f57f4bd37dc9b61bbd3
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ext/tt/macro_parser.rs

@@ -351,9 +351,9 @@ pub fn parse(sess: @ParseSess,
                 }
                 return Success(nameize(sess, ms, v));
             } else if eof_eis.len() > 1u {
-                return Error(sp, ~"Ambiguity: multiple successful parses");
+                return Error(sp, ~"ambiguity: multiple successful parses");
             } else {
-                return Failure(sp, ~"Unexpected end of macro invocation");
+                return Failure(sp, ~"unexpected end of macro invocation");
             }
         } else {
             if (bb_eis.len() > 0u && next_eis.len() > 0u)
@@ -367,12 +367,12 @@ pub fn parse(sess: @ParseSess,
                       _ => fail!()
                     } }).connect(" or ");
                 return Error(sp, format!(
-                    "Local ambiguity: multiple parsing options: \
+                    "local ambiguity: multiple parsing options: \
                      built-in NTs {} or {} other options.",
                     nts, next_eis.len()));
             } else if (bb_eis.len() == 0u && next_eis.len() == 0u) {
-                return Failure(sp, ~"No rules expected the token: "
-                            + to_str(get_ident_interner(), &tok));
+                return Failure(sp, format!("no rules expected the token `{}`",
+                            to_str(get_ident_interner(), &tok)));
             } else if (next_eis.len() > 0u) {
                 /* Now process the next token */
                 while(next_eis.len() > 0u) {