Rollup merge of #34436 - jseyfried:no_block_expr, r=eddyb
To allow these braced macro invocation, this PR removes the optional expression from `ast::Block` and instead uses a `StmtKind::Expr` at the end of the statement list.
Currently, braced macro invocations in blocks can expand into statements (and items) except when they are last in a block, in which case they can only expand into expressions.
For example,
```rust
macro_rules! make_stmt {
() => { let x = 0; }
}
fn f() {
make_stmt! {} //< This is OK...
let x = 0; //< ... unless this line is commented out.
}
```
Fixes #34418.
This commit is contained in:
@@ -818,10 +818,9 @@ fn noop_fold_bounds<T: Folder>(bounds: TyParamBounds, folder: &mut T)
|
||||
}
|
||||
|
||||
pub fn noop_fold_block<T: Folder>(b: P<Block>, folder: &mut T) -> P<Block> {
|
||||
b.map(|Block {id, stmts, expr, rules, span}| Block {
|
||||
b.map(|Block {id, stmts, rules, span}| Block {
|
||||
id: folder.new_id(id),
|
||||
stmts: stmts.move_flat_map(|s| folder.fold_stmt(s).into_iter()),
|
||||
expr: expr.and_then(|x| folder.fold_opt_expr(x)),
|
||||
rules: rules,
|
||||
span: folder.new_span(span),
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user