From ef29f7ff3659712bc045e47778c45ebe504f1387 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 30 Jul 2012 16:09:42 -0700
Subject: [PATCH] syntax: Fix semicolon printing. Closes #3036

---
 src/libsyntax/parse/token.rs        | 2 +-
 src/test/compile-fail/issue-3036.rs | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/test/compile-fail/issue-3036.rs

diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 51d5d52ebe8d..b6672936be63 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -136,7 +136,7 @@ fn to_str(in: interner<@~str>, t: token) -> ~str {
       DOT { ~"." }
       ELLIPSIS { ~"..." }
       COMMA { ~"," }
-      SEMI { ~"" }
+      SEMI { ~";" }
       COLON { ~":" }
       MOD_SEP { ~"::" }
       RARROW { ~"->" }
diff --git a/src/test/compile-fail/issue-3036.rs b/src/test/compile-fail/issue-3036.rs
new file mode 100644
index 000000000000..337d38f26acb
--- /dev/null
+++ b/src/test/compile-fail/issue-3036.rs
@@ -0,0 +1,6 @@
+// Testing that semicolon tokens are printed correctly in errors
+
+fn main()
+{
+    let x = 3
+} //~ ERROR: expected `;` but found `}`