rust-embed

git clone https://pyrossh.dev/repos/rust-embed.git

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

0fd4ff2b — pyros2097

fix release bundling and release v1.1.0

Files changed (6) hide show

.travis.yml +6 -2
Cargo.lock +1 -1
Cargo.toml +1 -1
readme.md +1 -1
rustfmt.toml +9 -0
src/lib.rs +13 -19

.travis.yml CHANGED Viewed

@@ -12,5 +12,9 @@ matrix:
 script:
   - |
     cargo clean
-    cargo test --lib
+    cargo test --tests --lib
-    cargo test --lib --release
+    cargo test --tests --lib --release
+    cargo clean
+    cargo build --example basic
+    cargo clean
+    cargo build --release --example basic

Cargo.lock CHANGED Viewed

@@ -714,7 +714,7 @@ dependencies = [
 [[package]]
 name = "rust-embed"
-version = "1.0.0"
+version = "1.1.0"
 dependencies = [
  "fern 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "rust-embed"
-version = "1.0.0"
+version = "1.1.0"
 description = "Rust Custom Derive Macro which loads files into the rust binary at compile time during release and loads the file from the fs during dev"
 readme = "readme.md"
 documentation = "https://docs.rs/rust-embed"

readme.md CHANGED Viewed

@@ -11,7 +11,7 @@ This is similar to [pony-embed](https://github.com/pyros2097/pony-embed).
 ```
 [dependencies]
-rust-embed="1.0.0"
+rust-embed="1.1.0"
 ```
 ## Documentation

rustfmt.toml ADDED Viewed

@@ -0,0 +1,9 @@
+unstable_features = true
+wrap_comments = true
+normalize_comments = true
+merge_derives = true
+fn_args_density = "Compressed"
+max_width = 160
+tab_spaces = 2
+indent_style = "Block"
+reorder_imported_names = true

src/lib.rs CHANGED Viewed

@@ -1,4 +1,6 @@
 #![recursion_limit = "1024"]
+#[macro_use]
+extern crate log;
 extern crate proc_macro;
 #[macro_use]
 extern crate quote;
@@ -45,21 +47,19 @@ fn generate_assets(ident: &syn::Ident, folder_path: String) -> quote::Tokens {
 }
 #[cfg(not(debug_assertions))]
-pub fn generate_assets(folder_path: String) -> Asset {
+fn generate_assets(ident: &syn::Ident, folder_path: String) -> quote::Tokens {
   use std::fs::File;
   use std::io::Read;
   use std::path::Path;
   use walkdir::WalkDir;
-  use std::collections::HashMap;
-  info!("loading folder -> {}", parent_path);
-  let mut map = HashMap::new();
+  let mut values = Vec::<Tokens>::new();
-  for entry in WalkDir::new(parent_path.clone())
+  for entry in WalkDir::new(folder_path.clone())
     .into_iter()
     .filter_map(|e| e.ok())
     .filter(|e| e.file_type().is_file())
   {
-    info!("asset from file -> {}", entry.path().display());
+    info!("file: {}", entry.path().display());
-    let base = &parent_path.clone();
+    let base = &folder_path.clone();
     let key = String::from(
       entry
         .path()
@@ -73,20 +73,16 @@ pub fn generate_assets(folder_path: String) -> Asset {
     file.read_to_end(&mut data).unwrap_or_else(|e| {
       panic!("could not read file -> {} {}", key, e);
     });
+    let value = quote!{
-    map.insert(key, data);
+      #key => Some(vec!#data),
+    };
+    values.push(value);
   }
-  Box::new(move |file_path| {
-    info!("asset from cache -> {}", file_path);
-    match map.get(&file_path) {
-      Some(s) => Some(s.to_vec()),
-      None => None,
-    }
-  });
   quote!{
       impl #ident {
           pub fn get(file_path: &str) -> Option<Vec<u8>> {
               match file_path {
-                  "index.html" => Some(vec![]),
+                  #(#values)*
                   _ => None,
               }
           }
@@ -95,9 +91,7 @@ pub fn generate_assets(folder_path: String) -> Asset {
 }
 fn help() {
-  panic!(
-    "#[derive(RustEmbed)] should contain one attribute like this #[golem(\"examples/public/\")]"
+  panic!("#[derive(RustEmbed)] should contain one attribute like this #[golem(\"examples/public/\")]");
-  );
 }
 fn impl_rust_embed(ast: &syn::DeriveInput) -> Tokens {

~repos /rust-embed

git clone https://pyrossh.dev/repos/rust-embed.git

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