From 7be059ffcd640096911b62b9135d2ffbf3a05abc Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Tue, 2 Dec 2014 13:59:27 -0500 Subject: [PATCH] Propagate expected type more widely so that we can rewrite the issue-14039 test in a more natural way. Previously the "type we will cast to" was hidden unless it was an integer. --- src/librustc_typeck/check/mod.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index ea33153f3b1a..eabf52c2cc8b 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -1390,13 +1390,7 @@ fn check_cast(fcx: &FnCtxt, let t_1 = fcx.to_ty(t); let t_1 = structurally_resolved_type(fcx, span, t_1); - if ty::type_is_scalar(t_1) { - // Supply the type as a hint so as to influence integer - // literals and other things that might care. - check_expr_with_expectation(fcx, e, ExpectCastableToType(t_1)) - } else { - check_expr(fcx, e) - } + check_expr_with_expectation(fcx, e, ExpectCastableToType(t_1)); let t_e = fcx.expr_ty(e);