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.

5d983bd5 — Mark Drobnak

Merge pull request #81 from pyros2097/tweak/shell-expand-help-message

Files changed (2) hide show

examples/warp.rs CHANGED Viewed

@@ -22,7 +22,7 @@ fn main() {
 }
 fn serve(path: &str) -> Result<impl Reply, Rejection> {
-  let mime = mime_guess::guess_mime_type(path);
+  let mime = mime_guess::from_path(path).first_or_octet_stream();
   let asset: Option<Cow<'static, [u8]>> = Asset::get(path);

impl/src/lib.rs CHANGED Viewed

@@ -13,7 +13,6 @@ use quote::Tokens;
 use std::path::Path;
 use syn::*;
 #[cfg(all(debug_assertions, not(feature = "debug-embed")))]
 fn generate_assets(ident: &syn::Ident, folder_path: String) -> quote::Tokens {
   quote! {
@@ -107,8 +106,8 @@ fn impl_rust_embed(ast: &syn::DeriveInput) -> Tokens {
   match ast.body {
     Body::Enum(_) => panic!("RustEmbed cannot be derived for enums"),
     Body::Struct(ref data) => match data {
-      &VariantData::Unit => {},
+      &VariantData::Unit => {}
-      _ => panic!("RustEmbed can only be derived for unit structs")
+      _ => panic!("RustEmbed can only be derived for unit structs"),
     },
   };
@@ -128,11 +127,20 @@ fn impl_rust_embed(ast: &syn::DeriveInput) -> Tokens {
   let folder_path = shellexpand::full(&folder_path).unwrap().to_string();
   if !Path::new(&folder_path).exists() {
-    panic!(
+    let mut message = format!(
       "#[derive(RustEmbed)] folder '{}' does not exist. cwd: '{}'",
       folder_path,
       std::env::current_dir().unwrap().to_str().unwrap()
     );
+    // Add a message about the interpolate-folder-path feature if the path may
+    // include a variable
+    if folder_path.contains("$") && cfg!(not(feature = "interpolate-folder-path")) {
+      message += "\nA variable has been detected. RustEmbed can expand variables \
+                  when the `interpolate-folder-path` feature is enabled.";
+    }
+    panic!(message);
   };
   generate_assets(&ast.ident, folder_path)