Skip to content

Commit 7166513

Browse files
committed
---
yaml --- r: 925 b: refs/heads/master c: 244c59a h: refs/heads/master i: 923: 494b39d v: v3
1 parent 7b4334d commit 7166513

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 6d92ca64a70e625fdb274390451c8ed911e02e79
2+
refs/heads/master: 244c59ac205fdb28128908f39d39b3eb9cb7a772

trunk/src/Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -517,17 +517,8 @@ TEST_XFAILS_LLVM := $(TASK_XFAILS) \
517517

518518
TEST_XFAILS_SELF := $(filter-out \
519519
$(addprefix test/run-pass/, \
520-
arith-0.rs \
521-
arith-2.rs \
522-
bool-not.rs \
523-
char.rs \
524-
fact.rs \
525-
dead-code-one-arm-if.rs \
526-
deep.rs \
527-
hello.rs \
528520
int.rs \
529521
item-name-overload.rs \
530-
lazy-init.rs \
531522
multiline-comment.rs \
532523
), \
533524
$(wildcard test/*/*.rs test/*/*.rc))

trunk/src/comp/middle/typeck.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
//
2-
// comp/middle/typeck.rs
3-
//
4-
51
import front.ast;
62
import front.ast.ann;
73
import middle.fold;
@@ -185,7 +181,8 @@ fn ty_to_str(@ty typ) -> str {
185181

186182
case (ty_fn(?inputs, ?output)) {
187183
auto f = fn_input_to_str;
188-
s = "fn(" + _str.connect(_vec.map[arg,str](f, inputs), ", ") + ")";
184+
s = "fn(" + _str.connect(_vec.map[arg,str](f, inputs),
185+
", ") + ")";
189186
if (output.struct != ty_nil) {
190187
s += " -> " + ty_to_str(output);
191188
}
@@ -604,7 +601,7 @@ fn unify(@ty expected, @ty actual) -> unify_result {
604601
auto result = unify_step(expected_output,
605602
actual_output, bindings);
606603
alt (result) {
607-
case (ures_ok(?rty)) {
604+
case (ures_ok(?rty)) {
608605
result_out = rty;
609606
}
610607

@@ -722,7 +719,7 @@ fn check_expr(&@env e, &@ty_table locals, @ast.expr expr) -> @ast.expr {
722719
ret @fold.respan[ast.expr_](expr.span,
723720
ast.expr_lit(lit, ast.ann_type(ty)));
724721
}
725-
722+
726723
case (_) {
727724
// TODO
728725
ret expr;
@@ -855,3 +852,13 @@ fn check_crate(session.session sess, @ast.crate crate) -> @ast.crate {
855852
ret fold.fold_crate[@env](e, fld, result._0);
856853
}
857854

855+
//
856+
// Local Variables:
857+
// mode: rust
858+
// fill-column: 78;
859+
// indent-tabs-mode: nil
860+
// c-basic-offset: 4
861+
// buffer-file-coding-system: utf-8-unix
862+
// compile-command: "make -k -C ../.. 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
863+
// End:
864+
//

0 commit comments

Comments
 (0)