OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Print out return type correctly in typestate error message

Browse Source 
In the "not all paths return" error message, typestate was printing
the AST type from the fn decl, not the ty::t type. This ended in tears
when the AST return type was "ty_infer". Now it looks up the function node
ID's type and uses util::ppaux::ty_to_str instead.

Closes #2163.
This commit is contained in:
Tim Chevalier 2012-04-20 18:47:01 -07:00
parent 43061f3969
commit 734166f41c
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rustc/middle/tstate/ck.rs
View File

@ -7,7 +7,8 @@ import middle::ty;
import tstate::ann::{precond, prestate,
implies, ann_precond, ann_prestate};
import aux::*;
import syntax::print::pprust::ty_to_str;
import util::ppaux::ty_to_str;
import bitvectors::*;
import annotate::annotate_crate;
import collect_locals::mk_f_to_fn_info;
@ -116,13 +117,14 @@ fn check_states_against_conditions(fcx: fn_ctxt,
!ty::type_is_nil(ty::ty_fn_ret(ty::node_id_to_type(
fcx.ccx.tcx, id))) &&
f_decl.cf == return_val {
let fn_ty = ty::node_id_to_type(fcx.ccx.tcx, id);
fcx.ccx.tcx.sess.span_err(f_body.span,
"in function " + fcx.name +
", not all control paths \
return a value");
#fmt("in function `%s`, not all control paths \
return a value", fcx.name));
fcx.ccx.tcx.sess.span_fatal(f_decl.output.span,
"see declared return type of '" +
ty_to_str(f_decl.output) + "'");
#fmt("see function return type of `%s`",
ty_to_str(fcx.ccx.tcx,
ty::ty_fn_ret(fn_ty))));
} else if f_decl.cf == noreturn {
// check that this really always fails

5
src/test/compile-fail/issue-2163.rs Normal file
View File

@ -0,0 +1,5 @@
fn main(s: [str]) {
let a = [];
vec::each(a) { |x| //! ERROR in function `anon`, not all control paths
} //! ERROR see function return type of `bool`
}