Merge #5926

bors[bot] · matklad · web-flow · commit 754b4c900e84 · 2020-09-01T12:57:28.000Z
5926: Bump token expansion limit
 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov &lt;aleksey.kladov@gmail.com&gt;
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
@@ -223,7 +223,7 @@ fn macro_expand_with_arg(
     let ExpandResult(tt, err) = macro_rules.0.expand(db, lazy_id, &macro_arg.0);
     // Set a hard limit for the expanded tt
     let count = tt.count();
-    if count > 65536 {
+    if count > 262144 {
         return (None, Some(format!("Total tokens count exceed limit : count = {}", count)));
     }
     (Some(Arc::new(tt)), err.map(|e| format!("{:?}", e)))

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ fn macro_expand_with_arg(`
`223`	`223`	`let ExpandResult(tt, err) = macro_rules.0.expand(db, lazy_id, &macro_arg.0);`
`224`	`224`	`// Set a hard limit for the expanded tt`
`225`	`225`	`let count = tt.count();`
`226`		`- if count > 65536 {`
	`226`	`+ if count > 262144 {`
`227`	`227`	`return (None, Some(format!("Total tokens count exceed limit : count = {}", count)));`
`228`	`228`	`}`
`229`	`229`	`(Some(Arc::new(tt)), err.map(\|e\| format!("{:?}", e)))`