Skip to content

Commit d876fc9

Browse files
committed
---
yaml --- r: 2949 b: refs/heads/master c: 4d8f715 h: refs/heads/master i: 2947: 66d79eb v: v3
1 parent 93729a0 commit d876fc9

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
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: 2736d63db073e5ae021177ff3ac3cb001789b493
2+
refs/heads/master: 4d8f715dab7862b4ad1f0c856f0e3cdd554e212a

trunk/src/comp/middle/resolve.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ fn ns_name(namespace ns) -> str {
481481
}
482482
}
483483

484-
fn unresolved(&env e, &span sp, &ident id, &str kind) {
484+
fn unresolved(&env e, &span sp, &ident id, &str kind) -> ! {
485485
e.sess.span_err(sp, "unresolved " + kind + ": " + id);
486486
}
487487

@@ -511,8 +511,6 @@ fn lookup_in_scope_strict(&env e, list[scope] sc, &span sp, &ident id,
511511
ret d;
512512
}
513513
}
514-
515-
fail; // fools the return-checker
516514
}
517515

518516
fn scope_is_fn(&scope sc) -> bool {
@@ -793,8 +791,6 @@ fn lookup_in_mod_strict(&env e, def m, &span sp, &ident id,
793791
ret d;
794792
}
795793
}
796-
797-
fail; // fools the return-checker
798794
}
799795

800796
fn lookup_in_mod(&env e, def m, &span sp, &ident id, namespace ns, dir dr)
@@ -854,7 +850,6 @@ fn lookup_import(&env e, def_id defid, namespace ns) -> option::t[def] {
854850
case (ns_module) { md } };
855851
}
856852
}
857-
fail; // fools the return-checker
858853
}
859854

860855

trunk/src/comp/middle/trans.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,6 @@ fn find_scope_cx(&@block_ctxt cx) -> @block_ctxt {
12151215
+ "called on parentless block_ctxt");
12161216
}
12171217
}
1218-
1219-
fail; // fools the return-checker
12201218
}
12211219

12221220
fn umax(&@block_ctxt cx, ValueRef a, ValueRef b) -> ValueRef {

0 commit comments

Comments
 (0)