bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix invalid lint_node_id being put on a removed stmt

Browse source
This commit is contained in:
Loïc BRANSTETT 2022-03-03 11:52:09 +01:00
parent 2f8d1a835b
commit 516488484e
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_expand/src/expand.rs
View file

@ -1841,7 +1841,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
self.flat_map_node(node)
}
fn flat_map_stmt(&mut self, mut node: ast::Stmt) -> SmallVec<[ast::Stmt; 1]> {
fn flat_map_stmt(&mut self, node: ast::Stmt) -> SmallVec<[ast::Stmt; 1]> {
// FIXME: invocations in semicolon-less expressions positions are expanded as expressions,
// changing that requires some compatibility measures.
if node.is_expr() {
@ -1863,7 +1863,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
self.cx.current_expansion.is_trailing_mac = false;
res
}
_ => assign_id!(self, &mut node.id, || noop_flat_map_stmt(node, self)),
_ => noop_flat_map_stmt(node, self),
};
}