Skip to content

Commit 6bde6d7

Browse files
committed
---
yaml --- r: 1563 b: refs/heads/master c: 5b7c3b8 h: refs/heads/master i: 1561: ee134d1 1559: 0210d63 v: v3
1 parent 88039ed commit 6bde6d7

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 1a05f99a10dacfbdecc1bf2458f14b10390c1180
2+
refs/heads/master: 5b7c3b8b5df8292e27943908fd4c16323c7833a8

trunk/src/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,6 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
479479
obj-dtor.rs \
480480
pred.rs \
481481
preempt.rs \
482-
rec-extend.rs \
483482
rt-circular-buffer.rs \
484483
size-and-align.rs \
485484
spawn-fn.rs \

trunk/src/comp/middle/typeck.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -2064,7 +2064,13 @@ fn check_expr(&@fn_ctxt fcx, @ast.expr expr) -> @ast.expr {
20642064

20652065
case (ast.expr_rec(?fields, ?base, _)) {
20662066

2067-
auto base_1 = base;
2067+
auto base_1;
2068+
alt (base) {
2069+
case (none[@ast.expr]) { base_1 = none[@ast.expr]; }
2070+
case (some[@ast.expr](?b_0)) {
2071+
base_1 = some[@ast.expr](check_expr(fcx, b_0));
2072+
}
2073+
}
20682074

20692075
let vec[ast.field] fields_1 = vec();
20702076
let vec[field] fields_t = vec();

0 commit comments

Comments
 (0)