---

yaml
---
r: 273123
b: refs/heads/beta
c: a48bd17
h: refs/heads/master
i:
  273121: da4eb11
  273119: 574c651

Author: oli-obk

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: bba1596c71989bdbad19ec06b27fa0d81d5bc58f
+refs/heads/beta: a48bd1718356cdcc4204b57ed282ff8111df5427
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/const_eval.rs

@@ -854,16 +854,12 @@ pub fn eval_const_expr_partial<'tcx>(tcx: &TyCtxt<'tcx>,
               Some(actual_e) => actual_e,
               None => signal!(e, NonConstPath)
           };
-          let item_hint = if let UncheckedExprNoHint = ty_hint {
-              match const_ty {
-                  Some(ty) => match ast_ty_to_prim_ty(tcx, ty) {
-                      Some(ty) => UncheckedExprHint(ty),
-                      None => UncheckedExprNoHint
-                  },
-                  None => UncheckedExprNoHint
-              }
-          } else {
-              ty_hint
+          let item_hint = match const_ty {
+              Some(ty) => match ast_ty_to_prim_ty(tcx, ty) {
+                  Some(ty) => ty_hint.checked_or(ty),
+                  None => ty_hint.erase_hint(),
+              },
+              None => ty_hint.erase_hint(),
           };
           try!(eval_const_expr_partial(tcx, const_expr, item_hint, fn_args))
       }