Merge #5320

5320: Bump macro recursion limit in release r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 8 insertions, 2 deletions

diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index 8c233a717..2fe04db2b 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -46,6 +46,12 @@ pub(crate) struct Expander {
     recursion_limit: usize,
 }
 
+#[cfg(test)]
+const EXPANSION_RECURSION_LIMIT: usize = 32;
+
+#[cfg(not(test))]
+const EXPANSION_RECURSION_LIMIT: usize = 128;
+
 impl CfgExpander {
     pub(crate) fn new(
         db: &dyn DefDatabase,
@@ -93,7 +99,7 @@ impl Expander {
         macro_call: ast::MacroCall,
     ) -> Option<(Mark, T)> {
         self.recursion_limit += 1;
-        if self.recursion_limit > 32 {
+        if self.recursion_limit > EXPANSION_RECURSION_LIMIT {
             mark::hit!(your_stack_belongs_to_me);
             return None;
         }
@@ -341,7 +347,7 @@ mod tests {
     fn your_stack_belongs_to_me() {
         mark::check!(your_stack_belongs_to_me);
         lower(
-            r"
+            "
 macro_rules! n_nuple {
     ($e:tt) => ();
     ($($rest:tt)*) => {{