Bypass instantiating Span-specific visit functions

dtolnay · Mar 9, 2025 · 22bd069 · 22bd069
1 parent bf0a11d
commit 22bd069
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/codegen/src/fold.rs b/codegen/src/fold.rs
@@ -207,9 +207,15 @@ fn node(traits: &mut TokenStream, impls: &mut TokenStream, s: &Node, defs: &Defi
         };
     }
 
+    let traits_body = if s.ident == "Span" {
+        quote!(i)
+    } else {
+        quote!(#fold_fn(self, i))
+    };
+
     traits.extend(quote! {
         fn #fold_fn(&mut self, i: #ty) -> #ty {
-            #fold_fn(self, i)
+            #traits_body
         }
     });
 

diff --git a/codegen/src/visit.rs b/codegen/src/visit.rs
@@ -183,9 +183,17 @@ fn node(traits: &mut TokenStream, impls: &mut TokenStream, s: &Node, defs: &Defi
         Some(quote!('ast))
     };
 
+    let traits_body = if s.ident == "Span" {
+        None
+    } else {
+        Some(quote! {
+            #visit_fn(self, i);
+        })
+    };
+
     traits.extend(quote! {
         fn #visit_fn(&mut self, i: &#ast_lifetime #ty) {
-            #visit_fn(self, i);
+            #traits_body
         }
     });
 

diff --git a/codegen/src/visit_mut.rs b/codegen/src/visit_mut.rs
@@ -186,9 +186,17 @@ fn node(traits: &mut TokenStream, impls: &mut TokenStream, s: &Node, defs: &Defi
         }
     }
 
+    let traits_body = if s.ident == "Span" {
+        None
+    } else {
+        Some(quote! {
+            #visit_mut_fn(self, i);
+        })
+    };
+
     traits.extend(quote! {
         fn #visit_mut_fn(&mut self, i: &mut #ty) {
-            #visit_mut_fn(self, i);
+            #traits_body
         }
     });
 

diff --git a/src/gen/fold.rs b/src/gen/fold.rs
diff --git a/src/gen/visit.rs b/src/gen/visit.rs
diff --git a/src/gen/visit_mut.rs b/src/gen/visit_mut.rs