bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #78853 - calebcartwright:fix-const-block-expr-span, r=spastorino

Browse source 
rustc_parse: fix ConstBlock expr span

The span for a ConstBlock expression should presumably run through the end of the block it contains and not stop at the keyword, just like is done with similar block-containing expression kinds, such as a TryBlock
This commit is contained in:
Jonas Schievink 2020-11-28 15:58:15 +01:00 • committed by GitHub
commit a732c3a369
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_parse/src/parser/mod.rs
View file

@ -873,7 +873,8 @@ impl<'a> Parser<'a> {
id: DUMMY_NODE_ID, id: DUMMY_NODE_ID,
value: self.mk_expr(blk.span, ExprKind::Block(blk, None), AttrVec::new()), value: self.mk_expr(blk.span, ExprKind::Block(blk, None), AttrVec::new()),
}; };
Ok(self.mk_expr(span, ExprKind::ConstBlock(anon_const), AttrVec::new())) let blk_span = anon_const.value.span;
Ok(self.mk_expr(span.to(blk_span), ExprKind::ConstBlock(anon_const), AttrVec::new()))
} }
/// Parses mutability (`mut` or nothing). /// Parses mutability (`mut` or nothing).