---

brson · brson · commit c2b7cd5dfa4a · 2012-07-30T16:09:52.000-07:00
yaml --- r: 20733 b: refs/heads/snap-stage3 c: ef29f7f h: refs/heads/master i: 20731: cbf166a v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 416584d3398bb1659b5dcc987f13e42fd4086486
+refs/heads/snap-stage3: ef29f7ff3659712bc045e47778c45ebe504f1387
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libsyntax/parse/token.rs b/branches/snap-stage3/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/branches/snap-stage3/src/test/compile-fail/issue-3036.rs b/branches/snap-stage3/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 `}`
