nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-02 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #78118 - spastorino:inline-const-followups, r=petrochenkov

Browse Source 
Inline const followups

r? @petrochenkov

Follow ups of #77124
This commit is contained in:
Yuki Okushi 2020-10-21 13:59:44 +09:00 committed by GitHub
commit de24210ebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_hir_pretty/src/lib.rs
View File

@ -1138,9 +1138,7 @@ impl<'a> State<'a> {
fn print_expr_anon_const(&mut self, anon_const: &hir::AnonConst) {
self.ibox(INDENT_UNIT);
self.s.word_space("const");
self.s.word("{");
self.print_anon_const(anon_const);
self.s.word("}");
self.end()
}

6
compiler/rustc_parse/src/parser/mod.rs
View File

@ -548,7 +548,11 @@ impl<'a> Parser<'a> {
fn check_inline_const(&mut self) -> bool {
self.check_keyword(kw::Const)
&& self.look_ahead(1, |t| t == &token::OpenDelim(DelimToken::Brace))
&& self.look_ahead(1, |t| match t.kind {
token::Interpolated(ref nt) => matches!(**nt, token::NtBlock(..)),
token::OpenDelim(DelimToken::Brace) => true,
_ => false,
})
}
/// Checks to see if the next token is either `+` or `+=`.

12
src/test/ui/inline-const/const-expr-macro.rs Normal file
View File

@ -0,0 +1,12 @@
// run-pass
#![allow(incomplete_features)]
#![feature(inline_const)]
macro_rules! do_const_block{
($val:block) => { const $val }
}
fn main() {
let s = do_const_block!({ 22 });
assert_eq!(s, 22);
}