---

yaml
---
r: 5191
b: refs/heads/master
c: 8e00161
h: refs/heads/master
i:
  5189: 648f0cb
  5187: 6473f12
  5183: 656a8d1
v: v3

Author: jruderman

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce432d4cf913fcfc522c2a9233f8855b1cf77545
+refs/heads/master: 8e001618192bbcbe34b8f539ab7d8fa87090700b

trunk/src/comp/syntax/print/pprust.rs

@@ -612,8 +612,9 @@ fn print_possibly_embedded_block(s: &ps, blk: &ast::blk, embedded: embed_type,
     tag expr_or_stmt { stmt_(@ast::stmt); expr_(@ast::expr); }
 
     // The Rust syntax has an ambiguity when an if, alt, or block statement is
-    // followed by a unary op or paren. In those cases we have to add an
-    // extra semi to make sure the output retains the same meaning.
+    // followed by a unary op, square bracket, or paren. In those cases we
+    // have to add an extra semi to make sure the output retains the same
+    // meaning.
     fn maybe_protect_block(s: &ps, last: &option::t<@ast::stmt>,
                            next: &expr_or_stmt) {
         let last_expr_is_block =
@@ -684,6 +685,7 @@ fn print_possibly_embedded_block(s: &ps, blk: &ast::blk, embedded: embed_type,
                 alt ex.node {
                   ast::expr_unary(_, _) { true }
                   ast::expr_tup(_) { true }
+                  ast::expr_vec(_, _) { true }
                   _ { false }
                 }
             }

trunk/src/test/pretty/block-disambig.rs

@@ -31,3 +31,5 @@ fn test10() -> int {
     alt true { true { } };
     (*regs)[0]
 }
+
+fn test11() -> [int] { if true { }; [1, 2] }