language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

hir_ty: cleanups and extend infinitely_recursive_macro_type test

Browse source
This commit is contained in:
cynecx 2021-04-18 20:18:48 +02:00
parent 6ed2fd233b
commit f0507ab7c6
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/hir_ty/src/lower.rs
View file

@ -296,9 +296,11 @@ impl<'a> TyLoweringContext<'a> {
}
}
TypeRef::Macro(macro_call) => {
let (expander, recursion_start) = match self.expander.borrow_mut() {
expander if expander.is_some() => (Some(expander), false),
mut expander => {
let (expander, recursion_start) = {
let mut expander = self.expander.borrow_mut();
if expander.is_some() {
(Some(expander), false)
} else {
if let Some(module_id) = self.resolver.module() {
*expander = Some(Expander::new(
self.db.upcast(),