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.

0e0db89f — Peter John

Merge pull request #117 from pyros2097/fix/windows-path-separator

Files changed (2) hide show

impl/src/lib.rs CHANGED Viewed

@@ -15,7 +15,7 @@ fn generate_assets(ident: &syn::Ident, folder_path: String) -> TokenStream2 {
               use std::fs;
               use std::path::Path;
-              let file_path = Path::new(#folder_path).join(file_path);
+              let file_path = Path::new(#folder_path).join(file_path.replace("\\", "/"));
               match fs::read(file_path) {
                   Ok(contents) => Some(std::borrow::Cow::from(contents)),
                   Err(_e) =>  {
@@ -80,7 +80,7 @@ fn generate_assets(ident: &syn::Ident, folder_path: String) -> TokenStream2 {
   quote! {
       impl #ident {
           pub fn get(file_path: &str) -> Option<std::borrow::Cow<'static, [u8]>> {
-              match file_path {
+              match file_path.replace("\\", "/").as_str() {
                   #(#match_values)*
                   _ => None,
               }

tests/lib.rs CHANGED Viewed

@@ -18,6 +18,15 @@ fn get_works() {
   }
 }
+/// Using Windows-style path separators (`\`) is acceptable
+#[test]
+fn get_windows_style() {
+  assert!(
+    Asset::get("images\\llama.png").is_some(),
+    "llama.png should be accessible via \"images\\lama.png\""
+  );
+}
 #[test]
 fn iter_works() {
   let mut num_files = 0;