bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tidy

Browse source
This commit is contained in:
Oliver Scherer 2019-12-23 17:31:55 +01:00
parent 49f5b0834b
commit b97abd0761
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/librustc_mir/const_eval/eval_queries.rs
View file

@ -310,11 +310,13 @@ pub fn const_eval_raw_provider<'tcx>(
// constant defined in this crate, we can figure out a lint level! // constant defined in this crate, we can figure out a lint level!
match tcx.def_kind(def_id) { match tcx.def_kind(def_id) {
// constants never produce a hard error at the definition site. Anything else is // constants never produce a hard error at the definition site. Anything else is
// a backwards compatibility hazard (and will break old versions of winapi for sure) // a backwards compatibility hazard (and will break old versions of winapi for
// sure)
// //
// note that validation may still cause a hard error on this very same constant, // note that validation may still cause a hard error on this very same constant,
// because any code that existed before validation could not have failed validation // because any code that existed before validation could not have failed
// thus preventing such a hard error from being a backwards compatibility hazard // validation thus preventing such a hard error from being a backwards
// compatibility hazard
Some(DefKind::Const) | Some(DefKind::AssocConst) => { Some(DefKind::Const) | Some(DefKind::AssocConst) => {
let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap(); let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
err.report_as_lint( err.report_as_lint(
@ -324,8 +326,9 @@ pub fn const_eval_raw_provider<'tcx>(
Some(err.span), Some(err.span),
) )
} }
// promoting runtime code is only allowed to error if it references broken constants // promoting runtime code is only allowed to error if it references broken
// any other kind of error will be reported to the user as a deny-by-default lint // constants any other kind of error will be reported to the user as a
// deny-by-default lint
_ => { _ => {
if let Some(p) = cid.promoted { if let Some(p) = cid.promoted {
let span = tcx.promoted_mir(def_id)[p].span; let span = tcx.promoted_mir(def_id)[p].span;
@ -342,8 +345,8 @@ pub fn const_eval_raw_provider<'tcx>(
Some(err.span), Some(err.span),
) )
} }
// anything else (array lengths, enum initializers, constant patterns) are reported // anything else (array lengths, enum initializers, constant patterns) are
// as hard errors // reported as hard errors
} else { } else {
err.report_as_error(ecx.tcx, "evaluation of constant value failed") err.report_as_error(ecx.tcx, "evaluation of constant value failed")
} }