Skip to content

Commit 6937cda

Browse files
committed
---
yaml --- r: 23213 b: refs/heads/master c: 3506685 h: refs/heads/master i: 23211: 5aff157 v: v3
1 parent a04e5ca commit 6937cda

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8e1f1e3b5208873e94f6de95c1f0f0b690a7aa89
2+
refs/heads/master: 350668579a4f3037fa4314fa03bcb97461896d4a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/print/pprust.rs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,11 @@ fn print_block_unclosed(s: ps, blk: ast::blk) {
838838
false);
839839
}
840840
841+
fn print_block_unclosed_indent(s: ps, blk: ast::blk, indented: uint) {
842+
print_possibly_embedded_block_(s, blk, block_normal, indented, ~[],
843+
false);
844+
}
845+
841846
fn print_block_with_attrs(s: ps, blk: ast::blk, attrs: ~[ast::attribute]) {
842847
print_possibly_embedded_block_(s, blk, block_normal, indent_unit, attrs,
843848
true);
@@ -1178,8 +1183,16 @@ fn print_expr(s: ps, &&expr: @ast::expr) {
11781183
assert arm.body.node.rules == ast::default_blk;
11791184
match arm.body.node.expr {
11801185
some(expr) => {
1181-
end(s); // close the ibox for the pattern
1182-
print_expr(s, expr);
1186+
match expr.node {
1187+
ast::expr_block(blk) => {
1188+
// the block will close the pattern's ibox
1189+
print_block_unclosed_indent(s, blk, alt_indent_unit);
1190+
}
1191+
_ => {
1192+
end(s); // close the ibox for the pattern
1193+
print_expr(s, expr);
1194+
}
1195+
}
11831196
if !expr_is_simple_block(expr)
11841197
&& i < len - 1 {
11851198
word(s.s, ~",");

0 commit comments

Comments
 (0)