diff options
| author | Dylan MacKenzie <ecstaticmorse@gmail.com> | 2019-12-13 10:44:38 -0800 |
|---|---|---|
| committer | Dylan MacKenzie <ecstaticmorse@gmail.com> | 2019-12-13 10:48:55 -0800 |
| commit | faa52d1cdaa8806201d56484df0c45bf550bf565 (patch) | |
| tree | 90b30d4fff4acd545e00fb5c14d575e5751bf191 /src | |
| parent | 0f0bfc9c2253c44fb826b057e4356bb50e9c704f (diff) | |
| download | rust-faa52d1cdaa8806201d56484df0c45bf550bf565.tar.gz rust-faa52d1cdaa8806201d56484df0c45bf550bf565.zip | |
Correctly mark things as `min_const_fn`
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_mir/transform/qualify_min_const_fn.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs index 7d0abb5d463..e2530795749 100644 --- a/src/librustc_mir/transform/qualify_min_const_fn.rs +++ b/src/librustc_mir/transform/qualify_min_const_fn.rs @@ -390,10 +390,12 @@ fn check_terminator( cleanup: _, } => check_operand(tcx, cond, span, def_id, body), - TerminatorKind::FalseUnwind { .. } if !tcx.features().const_loop => { - Err((span, "loops are not allowed in const fn".into())) - }, + | TerminatorKind::FalseUnwind { .. } + if feature_allowed(tcx, def_id, sym::const_loop) + => Ok(()), - TerminatorKind::FalseUnwind { .. } => Ok(()), + TerminatorKind::FalseUnwind { .. } => { + Err((span, "loops are not allowed in const fn".into())) + } } } |
