---

yaml
---
r: 51989
b: refs/heads/dist-snap
c: 65839fa
h: refs/heads/master
i:
  51987: e62e639
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 5c6e928e32390b410187f39f3bab9ffbcae4bd6a
+refs/heads/dist-snap: 65839fa622c623393893b5610b6d3b4151abe233
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/ty.rs

@@ -144,10 +144,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;
@@ -696,6 +697,7 @@ enum type_err {
     terr_in_field(@type_err, ast::ident),
     terr_sorts(expected_found<t>),
     terr_self_substs,
+    terr_integer_as_char,
     terr_no_integral_type,
     terr_no_floating_point_type,
 }
@@ -2520,6 +2522,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,
@@ -3489,6 +3498,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"

branches/dist-snap/src/librustc/middle/typeck/infer/unify.rs

@@ -362,6 +362,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;

branches/dist-snap/src/test/compile-fail/issue-3477.rs

@@ -0,0 +1,3 @@
+fn main() {
+    let _p: char = 100; //~ ERROR mismatched types: expected `char` but found
+}