Fix relativity finally

embed/src/dir.rs

@@ -70,16 +70,22 @@ pub fn __include_dir(caller: &str, path: &str) -> Dir {
 }
 
 #[macro_export]
-macro_rules! dir {
+macro_rules! __dir {
-    ($path:literal) => {{
+    ($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!($caller, $path)
-            // ::embed_macros::__include_dir!("embed/src/lib.rs", $path)
         }
     }};
 }
+
+#[macro_export]
+macro_rules! dir {
+    ($path:literal) => {
+        ::embed::__dir!(file!(), $path)
+    };
+}

embed/src/lib.rs

@@ -3,7 +3,3 @@ pub use dir::*;
 
 mod file;
 pub use file::*;
-
-// fn expand() {
-//     dir!(".")
-// }

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),
                 })
             });