RGBCube/embd-rs
1
Fork 0
mirror of https://github.com/RGBCube/embd-rs synced 2025-07-25 20:47:45 +00:00
Code Issues Activity Actions

Fix relativity finally

Browse source
This commit is contained in:
RGBCube 2024-01-04 13:40:05 +03:00
parent 41e02a9b3b
commit 9c39ac4a61
No known key found for this signature in database
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
embed/src/dir.rs
View file

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

4
embed/src/lib.rs
View file

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

1
macros/src/lib.rs
View file

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