bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Allow async {} expressions in const contexts

Browse source
This commit is contained in:
Jonas Schievink 2021-05-16 02:04:58 +02:00
parent 8cf990c9b5
commit bd16825767
10 changed files with 70 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -141,12 +141,20 @@ impl NonConstOp for FnPtrCast {
pub struct Generator(pub hir::GeneratorKind);
impl NonConstOp for Generator {
fn status_in_item(&self, _: &ConstCx<'_, '_>) -> Status {
Status::Forbidden
if let hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Block) = self.0 {
Status::Unstable(sym::const_async_blocks)
} else {
Status::Forbidden
}
}
fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> DiagnosticBuilder<'tcx> {
let msg = format!("{}s are not allowed in {}s", self.0, ccx.const_kind());
ccx.tcx.sess.struct_span_err(span, &msg)
if let hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Block) = self.0 {
feature_err(&ccx.tcx.sess.parse_sess, sym::const_async_blocks, span, &msg)
} else {
ccx.tcx.sess.struct_span_err(span, &msg)
}
}
}