bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Return true if check_const emits an error

Browse source
This commit is contained in:
Dylan MacKenzie 2020-09-17 11:08:43 -07:00
parent a173c5c1b3
commit 7fb9587a3c
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_mir/src/transform/check_consts/ops.rs
View file

@ -10,12 +10,12 @@ use rustc_span::{Span, Symbol};
use super::ConstCx; use super::ConstCx;
/// Emits an error if `op` is not allowed in the given const context. /// Emits an error and returns `true` if `op` is not allowed in the given const context.
pub fn non_const<O: NonConstOp>(ccx: &ConstCx<'_, '_>, op: O, span: Span) { pub fn non_const<O: NonConstOp>(ccx: &ConstCx<'_, '_>, op: O, span: Span) -> bool {
debug!("illegal_op: op={:?}", op); debug!("illegal_op: op={:?}", op);
let gate = match op.status_in_item(ccx) { let gate = match op.status_in_item(ccx) {
Status::Allowed => return, Status::Allowed => return false,
Status::Unstable(gate) if ccx.tcx.features().enabled(gate) => { Status::Unstable(gate) if ccx.tcx.features().enabled(gate) => {
let unstable_in_stable = ccx.is_const_stable_const_fn() let unstable_in_stable = ccx.is_const_stable_const_fn()
@ -23,18 +23,21 @@ pub fn non_const<O: NonConstOp>(ccx: &ConstCx<'_, '_>, op: O, span: Span) {
if unstable_in_stable { if unstable_in_stable {
ccx.tcx.sess ccx.tcx.sess
.struct_span_err(span, &format!("`#[feature({})]` cannot be depended on in a const-stable function", gate.as_str())) .struct_span_err(
span,
&format!("const-stable function cannot use `#[feature({})]`", gate.as_str()),
)
.span_suggestion( .span_suggestion(
ccx.body.span, ccx.body.span,
"if it is not part of the public API, make this function unstably const", "if it is not part of the public API, make this function unstably const",
concat!(r#"#[rustc_const_unstable(feature = "...", issue = "...")]"#, '\n').to_owned(), concat!(r#"#[rustc_const_unstable(feature = "...", issue = "...")]"#, '\n').to_owned(),
Applicability::HasPlaceholders, Applicability::HasPlaceholders,
) )
.help("otherwise `#[allow_internal_unstable]` can be used to bypass stability checks") .note("otherwise `#[allow_internal_unstable]` can be used to bypass stability checks")
.emit(); .emit();
} }
return; return unstable_in_stable;
} }
Status::Unstable(gate) => Some(gate), Status::Unstable(gate) => Some(gate),
@ -43,10 +46,11 @@ pub fn non_const<O: NonConstOp>(ccx: &ConstCx<'_, '_>, op: O, span: Span) {
if ccx.tcx.sess.opts.debugging_opts.unleash_the_miri_inside_of_you { if ccx.tcx.sess.opts.debugging_opts.unleash_the_miri_inside_of_you {
ccx.tcx.sess.miri_unleashed_feature(span, gate); ccx.tcx.sess.miri_unleashed_feature(span, gate);
return; return false;
} }
op.emit_error(ccx, span); op.emit_error(ccx, span);
true
} }
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]