OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prefer the (associated) const's type over the type hint

Browse Source
This commit is contained in:
Oliver Schneider 2016-03-03 14:46:20 +01:00
parent bba1596c71
commit a48bd17183
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librustc/middle/const_eval.rs
View File

@ -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))
}