From 9c39ac4a61a8414f14700543e8484a73e124c8ea Mon Sep 17 00:00:00 2001
From: RGBCube <RGBCube@users.noreply.github.com>
Date: Thu, 4 Jan 2024 13:40:05 +0300
Subject: [PATCH] Fix relativity finally

---
 embed/src/dir.rs  | 16 +++++++++++-----
 embed/src/lib.rs  |  4 ----
 macros/src/lib.rs |  1 -
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/embed/src/dir.rs b/embed/src/dir.rs
index dc4bdab..6152443 100644
--- a/embed/src/dir.rs
+++ b/embed/src/dir.rs
@@ -70,16 +70,22 @@ pub fn __include_dir(caller: &str, path: &str) -> Dir {
 }
 
 #[macro_export]
-macro_rules! dir {
-    ($path:literal) => {{
+macro_rules! __dir {
+    ($caller:literal, $path:literal) => {{
         #[cfg(debug_assertions)]
         {
-            ::embed::__include_dir(file!(), $path)
+            ::embed::__include_dir($caller, $path)
         }
         #[cfg(not(debug_assertions))]
         {
-            ::embed_macros::__include_dir!(file!(), $path) // FIXME
-            // ::embed_macros::__include_dir!("embed/src/lib.rs", $path)
+            ::embed_macros::__include_dir!($caller, $path)
         }
     }};
 }
+
+#[macro_export]
+macro_rules! dir {
+    ($path:literal) => {
+        ::embed::__dir!(file!(), $path)
+    };
+}
diff --git a/embed/src/lib.rs b/embed/src/lib.rs
index 43a4553..54d51d6 100644
--- a/embed/src/lib.rs
+++ b/embed/src/lib.rs
@@ -3,7 +3,3 @@ pub use dir::*;
 
 mod file;
 pub use file::*;
-
-// fn expand() {
-//     dir!(".")
-// }
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 9cb461f..f318cc9 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -110,7 +110,6 @@ fn read_dir(base: &PathBuf, path: &PathBuf) -> Vec<TokenStream> {
             entries.push(quote! {
                 ::embed::DirEntry(::embed::File {
                     content: include_bytes!(#path_str),
-                    // content: include_bytes(#path_str),
                     path: ::std::path::PathBuf::from(#path_str),
                 })
             });