rust-embed

rust macro which loads files into the rust binary at compile time during release and loads the file from the fs during dev.

5d5ae812 — Peter John

Merge pull request #101 from pyros2097/fix/relative-path-resolution

Files changed (2) hide show

changelog.md CHANGED Viewed

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Thanks to [Mcat12](https://github.com/Mcat12) for the changelog.
+## Unreleased
+### Fixed
+- Fixed the `folder` directory being relative to the current directory.
+  It is now relative to `Cargo.toml`.
 ## [5.4.0] - 2020-02-24
 ### Changed

impl/src/lib.rs CHANGED Viewed

@@ -4,7 +4,7 @@ extern crate quote;
 extern crate proc_macro;
 use proc_macro::TokenStream;
-use std::path::Path;
+use std::{env, path::Path};
 use syn::{export::TokenStream2, Data, DeriveInput, Fields, Lit, Meta};
 #[cfg(all(debug_assertions, not(feature = "debug-embed")))]
@@ -144,6 +144,17 @@ fn impl_rust_embed(ast: &syn::DeriveInput) -> TokenStream2 {
   #[cfg(feature = "interpolate-folder-path")]
   let folder_path = shellexpand::full(&folder_path).unwrap().to_string();
+  // Base relative paths on the Cargo.toml location
+  let folder_path = if Path::new(&folder_path).is_relative() {
+    Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap())
+      .join(folder_path)
+      .to_str()
+      .unwrap()
+      .to_owned()
+  } else {
+    folder_path
+  };
   if !Path::new(&folder_path).exists() {
     let mut message = format!(
       "#[derive(RustEmbed)] folder '{}' does not exist. cwd: '{}'",