Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5320

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



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-11 18:02:33 +00:00 committed by GitHub
commit 00c81f8006
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_hir_def/src/body.rs
View file

@ -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)*) => {{