diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index c072889c5249..abeea65b01f9 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -162,10 +162,11 @@ export kind_is_durable; export meta_kind, kind_lteq, type_kind, type_kind_ext; export operators; export type_err, terr_vstore_kind; -export terr_mismatch, terr_onceness_mismatch; +export terr_integer_as_char, terr_mismatch, terr_onceness_mismatch; export type_err_to_str, note_and_explain_type_err; export expected_found; export type_needs_drop; +export type_is_char; export type_is_empty; export type_is_integral; export type_is_numeric; @@ -714,6 +715,7 @@ enum type_err { terr_in_field(@type_err, ast::ident), terr_sorts(expected_found), terr_self_substs, + terr_integer_as_char, terr_no_integral_type, terr_no_floating_point_type, } @@ -2541,6 +2543,13 @@ fn type_is_integral(ty: t) -> bool { } } +fn type_is_char(ty: t) -> bool { + match get(ty).sty { + ty_int(ty_char) => true, + _ => false + } +} + fn type_is_fp(ty: t) -> bool { match get(ty).sty { ty_infer(FloatVar(_)) | ty_float(_) => true, @@ -3510,6 +3519,10 @@ fn type_err_to_str(cx: ctxt, err: &type_err) -> ~str { ~"couldn't determine an appropriate integral type for integer \ literal" } + terr_integer_as_char => { + ~"integer literals can't be inferred to char type \ + (try an explicit cast)" + } terr_no_floating_point_type => { ~"couldn't determine an appropriate floating point type for \ floating point literal" diff --git a/src/librustc/middle/typeck/infer/unify.rs b/src/librustc/middle/typeck/infer/unify.rs index 17464d8c13e5..90fb9e47b651 100644 --- a/src/librustc/middle/typeck/infer/unify.rs +++ b/src/librustc/middle/typeck/infer/unify.rs @@ -366,6 +366,10 @@ impl infer_ctxt { } fn int_var_sub_t(a_id: ty::IntVid, b: ty::t) -> ures { + if ty::type_is_char(b) { + return Err(ty::terr_integer_as_char); + } + assert ty::type_is_integral(b); let vb = &self.int_var_bindings; diff --git a/src/test/compile-fail/issue-3477.rs b/src/test/compile-fail/issue-3477.rs new file mode 100644 index 000000000000..7e189348db35 --- /dev/null +++ b/src/test/compile-fail/issue-3477.rs @@ -0,0 +1,3 @@ +fn main() { + let _p: char = 100; //~ ERROR mismatched types: expected `char` but found +} \ No newline at end of file