aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-07-19 11:50:30 -0700
committerGraydon Hoare <[email protected]>2010-07-19 11:50:41 -0700
commitbacb8e6b7995e242145871c8228cae4dbda7b891 (patch)
treee00cd6499de896161845ddefd897b9b912693728 /src
parentChange the body-fetching GEP in mark_ty to be dynamic. Our box may be parame... (diff)
downloadrust-bacb8e6b7995e242145871c8228cae4dbda7b891.tar.xz
rust-bacb8e6b7995e242145871c8228cae4dbda7b891.zip
Missing semicolon in type.ml, plus test to catch regression. Closes #113.
Diffstat (limited to 'src')
-rw-r--r--src/boot/me/type.ml2
-rw-r--r--src/test/compile-fail/wrong-ret-type.rs7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/boot/me/type.ml b/src/boot/me/type.ml
index 14047f44..a631e58d 100644
--- a/src/boot/me/type.ml
+++ b/src/boot/me/type.ml
@@ -771,7 +771,7 @@ let check_stmt (cx:Semant.ctxt) : (fn_ctx -> Ast.stmt -> unit) =
| Ast.STMT_ret (Some atom) ->
if fn_ctx.fnctx_is_iter then
Common.err None
- "iterators can't return values; did you mean 'put'?"
+ "iterators can't return values; did you mean 'put'?";
demand fn_ctx.fnctx_return_type (check_atom atom)
| Ast.STMT_ret None ->
diff --git a/src/test/compile-fail/wrong-ret-type.rs b/src/test/compile-fail/wrong-ret-type.rs
new file mode 100644
index 00000000..f00a734c
--- /dev/null
+++ b/src/test/compile-fail/wrong-ret-type.rs
@@ -0,0 +1,7 @@
+// error-pattern: mismatched types
+fn mk_int() -> uint {
+ let int i = 3;
+ ret i;
+}
+fn main() {
+}