From c545f8a8c3656da5ba8a0a49b9531e708b34b14d Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Thu, 18 Jul 2024 07:50:22 -0400
Subject: [PATCH] wip

---
 components/salsa-macro-rules/src/lib.rs                         | 2 +-
 .../salsa-macro-rules/src/{setup_fn.rs => setup_tracked_fn.rs}  | 2 +-
 components/salsa-macros/src/tracked_fn.rs                       | 2 +-
 src/lib.rs                                                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename components/salsa-macro-rules/src/{setup_fn.rs => setup_tracked_fn.rs} (99%)

diff --git a/components/salsa-macro-rules/src/lib.rs b/components/salsa-macro-rules/src/lib.rs
index da0fefa8..02ae8029 100644
--- a/components/salsa-macro-rules/src/lib.rs
+++ b/components/salsa-macro-rules/src/lib.rs
@@ -16,9 +16,9 @@ mod macro_if;
 mod maybe_backdate;
 mod maybe_clone;
 mod setup_accumulator_impl;
-mod setup_fn;
 mod setup_input_struct;
 mod setup_interned_struct;
 mod setup_method_body;
+mod setup_tracked_fn;
 mod setup_tracked_struct;
 mod unexpected_cycle_recovery;
diff --git a/components/salsa-macro-rules/src/setup_fn.rs b/components/salsa-macro-rules/src/setup_tracked_fn.rs
similarity index 99%
rename from components/salsa-macro-rules/src/setup_fn.rs
rename to components/salsa-macro-rules/src/setup_tracked_fn.rs
index cf254fa6..08d461c3 100644
--- a/components/salsa-macro-rules/src/setup_fn.rs
+++ b/components/salsa-macro-rules/src/setup_tracked_fn.rs
@@ -1,6 +1,6 @@
 /// Macro for setting up a function that must intern its arguments.
 #[macro_export]
-macro_rules! setup_fn {
+macro_rules! setup_tracked_fn {
     (
         // Attributes on the function
         attrs: [$(#[$attr:meta]),*],
diff --git a/components/salsa-macros/src/tracked_fn.rs b/components/salsa-macros/src/tracked_fn.rs
index 7a330676..b03af904 100644
--- a/components/salsa-macros/src/tracked_fn.rs
+++ b/components/salsa-macros/src/tracked_fn.rs
@@ -110,7 +110,7 @@ impl Macro {
 
         Ok(crate::debug::dump_tokens(
             fn_name,
-            quote![salsa::plumbing::setup_fn! {
+            quote![salsa::plumbing::setup_tracked_fn! {
                 attrs: [#(#attrs),*],
                 vis: #vis,
                 fn_name: #fn_name,
diff --git a/src/lib.rs b/src/lib.rs
index 745ef786..299714e9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -112,10 +112,10 @@ pub mod plumbing {
     pub use salsa_macro_rules::maybe_clone;
     pub use salsa_macro_rules::maybe_cloned_ty;
     pub use salsa_macro_rules::setup_accumulator_impl;
-    pub use salsa_macro_rules::setup_fn;
     pub use salsa_macro_rules::setup_input_struct;
     pub use salsa_macro_rules::setup_interned_struct;
     pub use salsa_macro_rules::setup_method_body;
+    pub use salsa_macro_rules::setup_tracked_fn;
     pub use salsa_macro_rules::setup_tracked_struct;
     pub use salsa_macro_rules::unexpected_cycle_recovery;