about summary refs log tree commit diff
path: root/compiler/rustc_parse/src/parser/expr.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-10-17 14:44:51 +0000
committerbors <bors@rust-lang.org>2020-10-17 14:44:51 +0000
commit6af9846fcc8797bf97e9fb387385208c2219f3d0 (patch)
tree527522b82ce55cd2bcc37b14096e6c1de63660bc /compiler/rustc_parse/src/parser/expr.rs
parentdda2b5e3e260c14b868c494008af1c8981eaa5a8 (diff)
parent03321b8cca91cd5d1f9c82a447add69329e52cea (diff)
downloadrust-6af9846fcc8797bf97e9fb387385208c2219f3d0.tar.gz
rust-6af9846fcc8797bf97e9fb387385208c2219f3d0.zip
Auto merge of #77124 - spastorino:const-exprs-rfc-2920, r=oli-obk
Implement const expressions and patterns (RFC 2920)

cc `@ecstatic-morse` `@lcnr` `@oli-obk` `@petrochenkov`
Diffstat (limited to 'compiler/rustc_parse/src/parser/expr.rs')
-rw-r--r--compiler/rustc_parse/src/parser/expr.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
index 17cbaf65420..fb05f8791a5 100644
--- a/compiler/rustc_parse/src/parser/expr.rs
+++ b/compiler/rustc_parse/src/parser/expr.rs
@@ -1060,6 +1060,8 @@ impl<'a> Parser<'a> {
             })
         } else if self.eat_keyword(kw::Unsafe) {
             self.parse_block_expr(None, lo, BlockCheckMode::Unsafe(ast::UserProvided), attrs)
+        } else if self.check_inline_const() {
+            self.parse_const_expr(lo.to(self.token.span))
         } else if self.is_do_catch_block() {
             self.recover_do_catch(attrs)
         } else if self.is_try_block() {