---

brson · brson · commit 0b3917a6d75e · 2012-07-30T16:09:52.000-07:00
yaml --- r: 22841 b: refs/heads/master c: ef29f7f h: refs/heads/master i: 22839: 030be81 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 416584d3398bb1659b5dcc987f13e42fd4086486
+refs/heads/master: ef29f7ff3659712bc045e47778c45ebe504f1387
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/libsyntax/parse/token.rs b/trunk/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/trunk/src/test/compile-fail/issue-3036.rs b/trunk/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 `}`
