---

yaml
---
r: 273119
b: refs/heads/beta
c: 41f11d9
h: refs/heads/master
i:
  273117: 930c649
  273115: c9ed25a
  273111: 5ed4eca
  273103: 0ce5b6e
  273087: ae15197

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: 0d13231a4cfb1f24c7cfc8168d15d19c63bdbdba
+refs/heads/beta: 41f11d95c70cc2f65ee9f068d46a7a6de8f911b3
 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,24 +854,7 @@ pub fn eval_const_expr_partial<'tcx>(tcx: &TyCtxt<'tcx>,
 
           let mut call_args = NodeMap();
           for (arg, arg_expr) in decl.inputs.iter().zip(args.iter()) {
-              let arg_hint = match ty_hint {
-                  ExprTypeChecked => ExprTypeChecked,
-                  UncheckedExprNoHint | UncheckedExprHint(_) => {
-                      if let Some(hint) = tcx.ast_ty_to_ty_cache.borrow().get(&arg.ty.id) {
-                          let mut new_ty_hint = UncheckedExprHint(hint);
-                          for t in hint.walk() {
-                              if let ty::TypeVariants::TyParam(_) = t.sty {
-                                  // found a generic argument, but we are in typeck
-                                  new_ty_hint = UncheckedExprNoHint;
-                                  break;
-                              }
-                          }
-                          new_ty_hint
-                      } else {
-                          UncheckedExprNoHint
-                      }
-                  },
-              };
+              let arg_hint = ty_hint.erase_hint();
               let arg_val = try!(eval_const_expr_partial(
                   tcx,
                   arg_expr,