Skip to content

Commit 2a407c2

Browse files
sanxiynalexcrichton
authored andcommitted
---
yaml --- r: 149163 b: refs/heads/try2 c: 606c23a h: refs/heads/master i: 149161: 3f127bc 149159: ee01aec v: v3
1 parent 1a4c5e1 commit 2a407c2

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 745aa7482ace9f62fcd08ff7a9195fd484527c94
8+
refs/heads/try2: 606c23a78920c03758e200004fd9d1f4257f0325
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3035,6 +3035,7 @@ pub fn check_expr_with_unifier(fcx: @FnCtxt,
30353035
if type_is_c_like_enum(fcx, expr.span, t_e) && t_1_is_trivial {
30363036
// casts from C-like enums are allowed
30373037
} else if t_1_is_char {
3038+
let te = fcx.infcx().resolve_type_vars_if_possible(te);
30383039
if ty::get(te).sty != ty::ty_uint(ast::TyU8) {
30393040
fcx.type_error_message(expr.span, |actual| {
30403041
format!("only `u8` can be cast as `char`, not `{}`", actual)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
pub fn main() {
12+
assert_eq!((0 + 0u8) as char, '\0');
13+
}

0 commit comments

Comments
 (0)