From f0507ab7c697ba4bcd59dd2f673dfff5072e3e1a Mon Sep 17 00:00:00 2001
From: cynecx <me@cynecx.net>
Date: Sun, 18 Apr 2021 20:18:48 +0200
Subject: [PATCH] hir_ty: cleanups and extend infinitely_recursive_macro_type 
 test

---
 crates/hir_ty/src/lower.rs        |  8 +++++---
 crates/hir_ty/src/tests/macros.rs | 14 +++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs
index a883334afb..7fd46becdb 100644
--- a/crates/hir_ty/src/lower.rs
+++ b/crates/hir_ty/src/lower.rs
@@ -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(),
diff --git a/crates/hir_ty/src/tests/macros.rs b/crates/hir_ty/src/tests/macros.rs
index 8de1e229f0..6588aa46c1 100644
--- a/crates/hir_ty/src/tests/macros.rs
+++ b/crates/hir_ty/src/tests/macros.rs
@@ -1248,14 +1248,18 @@ fn macros_in_type_generics() {
 fn infinitely_recursive_macro_type() {
     check_infer(
         r#"
-        struct Bar<T>(T);
+        struct Bar<T, X>(T, X);
 
         macro_rules! Foo {
             () => { Foo!() }
         }
 
+        macro_rules! U32 {
+            () => { u32 }
+        }
+
         type A = Foo!();
-        type B = Bar<Foo!()>;
+        type B = Bar<Foo!(), U32!()>;
 
         fn main() {
             let a: A;
@@ -1263,9 +1267,9 @@ fn infinitely_recursive_macro_type() {
         }
         "#,
         expect![[r#"
-            112..143 '{     ...: B; }': ()
-            122..123 'a': {unknown}
-            136..137 'b': Bar<{unknown}>
+            166..197 '{     ...: B; }': ()
+            176..177 'a': {unknown}
+            190..191 'b': Bar<{unknown}, u32>
         "#]],
     );
 }