Fix macro_rules! export issue by removing proc-macro flag

apache · Mar 4, 2025 · 4b079a6 · 4b079a6
1 parent f1d73bf
commit 4b079a6
Show file tree

Hide file tree

Showing 6 changed files with 226 additions and 183 deletions.
diff --git a/datafusion/core/src/lib.rs b/datafusion/core/src/lib.rs
@@ -15,6 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
+// Imported the macro from the macros crate
+use datafusion_macros::user_doc_cfg;
+user_doc_cfg!();
+
+
+
+
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg",
     html_favicon_url = "https://raw.githubusercontent.com/apache/datafusion/19fe44cf2f30cbdd63d4a4f52c74055163c6cc38/docs/logos/standalone_logo/logo_original.svg"

diff --git a/datafusion/macros/Cargo.toml b/datafusion/macros/Cargo.toml
@@ -35,9 +35,8 @@ workspace = true
 
 [lib]
 name = "datafusion_macros"
-# lib.rs to be re-added in the future
-path = "src/user_doc.rs"
-proc-macro = true
+path = "src/lib.rs" # Change path to lib.rs 
+
 
 [dependencies]
 datafusion-expr = { workspace = true }

diff --git a/datafusion/macros/src/lib.rs b/datafusion/macros/src/lib.rs
@@ -0,0 +1,10 @@
+// Imported the macro from the macros crate
+use datafusion_macros::user_doc_cfg;
+
+// macro for documentation attributes
+user_doc_cfg!();
+
+// Include the user_doc module
+pub mod user_doc;
+
+
diff --git a/datafusion/macros/src/macros.rs b/datafusion/macros/src/macros.rs