Skip to content

typestrong const integers #30587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 14, 2016
+1,823 −1,041
Merged

typestrong const integers #30587

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7bde56e
typestrong constant integers
oli-obk Dec 16, 2015
0d13231
const eval failures aren't fatal, simply return a dummy instead
Dec 27, 2015
41f11d9
don't guess const fn argument types
oli-obk Feb 24, 2016
6ee6003
infer integral types in presence of a type hint
oli-obk Feb 25, 2016
54b15c7
the type hint given during a cast operation is just a soft hint
oli-obk Feb 25, 2016
bba1596
also print the expected type in the error message
oli-obk Feb 25, 2016
a48bd17
prefer the (associated) const's type over the type hint
oli-obk Mar 3, 2016
6992280
simplify const path lookup for constants and associated constants
oli-obk Mar 3, 2016
7003ed3
fix rustdoc
oli-obk Mar 4, 2016
d4d6260
don't be a breaking change, even in presence of overflowing literals
oli-obk Mar 9, 2016
fcee002
break enum variant discriminant inference in case of 32-bit
oli-obk Mar 10, 2016
08c448a
undo changes to run-pass tests that aren't errors anymore
oli-obk Mar 11, 2016
f665c39
rustbuild
oli-obk Mar 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
prefer the (associated) const's type over the type hint
  • Loading branch information
@oli-obk
oli-obk committed Mar 10, 2016
commit a48bd1718356cdcc4204b57ed282ff8111df5427
16 changes: 6 additions & 10 deletions src/librustc/middle/const_eval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down