bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

ast: Always keep a NodeId in ast::Crate

Browse source 
This makes it more uniform with other expanded nodes
This commit is contained in:
Vadim Petrochenkov 2022-01-05 16:09:55 +08:00
parent 26c9b0046f
commit 55595c5616
11 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -377,6 +377,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
dir_path,
});
let krate = self.fully_expand_fragment(AstFragment::Crate(krate)).make_crate();
assert_eq!(krate.id, ast::CRATE_NODE_ID);
self.cx.trace_macros_diag();
krate
}
@ -1169,7 +1170,8 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
attrs: Vec::new(),
items: Vec::new(),
span,
is_placeholder: None,
id: self.cx.resolver.next_node_id(),
is_placeholder: false,
};
}
};
@ -1180,7 +1182,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
.make_crate();
}
noop_visit_crate(&mut krate, self);
assign_id!(self, &mut krate.id, || noop_visit_crate(&mut krate, self));
krate
})
}