Merge pull request #40 from vemoo/avoid-vec

Avoid vector allocation

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust-embed"
-version = "3.0.2"
+version = "4.0.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"

examples/actix.rs

@@ -3,8 +3,8 @@ extern crate actix_web;
 extern crate rust_embed;
 extern crate mime_guess;
 
-use actix_web::{App, HttpRequest, HttpResponse, server};
 use actix_web::http::Method;
+use actix_web::{server, App, Body, HttpRequest, HttpResponse};
 use mime_guess::guess_mime_type;
 
 #[derive(RustEmbed)]
@@ -13,11 +13,9 @@ struct Asset;
 
 fn handle_embedded_file(path: &str) -> HttpResponse {
   match Asset::get(path) {
-    Some(content) => {
-      HttpResponse::Ok()
-        .content_type(guess_mime_type(path).as_ref())
-        .body(content)
-    }
+    Some(content) => HttpResponse::Ok()
+      .content_type(guess_mime_type(path).as_ref())
+      .body(Body::from_slice(content.as_ref())),
     None => HttpResponse::NotFound().body("404 Not Found"),
   }
 }
@@ -32,13 +30,8 @@ fn dist(req: HttpRequest) -> HttpResponse {
 }
 
 fn main() {
-  server::new(|| {
-    App::new().route("/", Method::GET, index).route(
-      "/dist/{_:.*}",
-      Method::GET,
-      dist,
-    )
-  }).bind("127.0.0.1:8000")
+  server::new(|| App::new().route("/", Method::GET, index).route("/dist/{_:.*}", Method::GET, dist))
+    .bind("127.0.0.1:8000")
     .unwrap()
     .run();
 }

examples/basic.rs

@@ -7,5 +7,5 @@ struct Asset;
 
 fn main() {
   let index_html = Asset::get("index.html").unwrap();
-  println!("{:?}", std::str::from_utf8(&index_html));
+  println!("{:?}", std::str::from_utf8(index_html.as_ref()));
 }

readme.md

@@ -13,7 +13,7 @@ You can use this to embed your css, js and images into a single executable which
 
 ```
 [dependencies]
-rust-embed="3.0.2"
+rust-embed="4.0.0"
 ```
 
 ## Documentation
@@ -23,9 +23,9 @@ You need to add the custom derive macro RustEmbed to your struct with an attribu
 #[folder = "examples/public/"]
 struct Asset;
 ```
-This macro adds a single static method `get` to your type. This method allows you to get your assets from the fs during dev and from the binary during release. It takes the file path as string and returns an optional vector of u8.
+This macro adds a single static method `get` to your type. This method allows you to get your assets from the fs during dev and from the binary during release. It takes the file path as string and returns an `Option` with the bytes.
 ```rust
-pub fn get(file_path: &str) -> Option<Vec<u8>>
+pub fn get(file_path: &str) -> Option<impl AsRef<[u8]>>
 ```
 
 ## Usage
@@ -39,7 +39,7 @@ struct Asset;
 
 fn main() {
   let index_html = Asset::get("index.html").unwrap();
-  println!("{:?}", std::str::from_utf8(&index_html));
+  println!("{:?}", std::str::from_utf8(index_html.as_ref()));
 }
 ```
 

src/lib.rs

@@ -7,15 +7,15 @@ extern crate syn;
 extern crate walkdir;
 
 use proc_macro::TokenStream;
-use syn::*;
 use quote::Tokens;
 use std::path::Path;
+use syn::*;
 
 #[cfg(debug_assertions)]
 fn generate_assets(ident: &syn::Ident, folder_path: String) -> quote::Tokens {
   quote!{
       impl #ident {
-          pub fn get(file_path: &str) -> Option<Vec<u8>> {
+          pub fn get(file_path: &str) -> Option<impl AsRef<[u8]>> {
               use std::fs::File;
               use std::io::Read;
               use std::path::Path;
@@ -63,13 +63,13 @@ fn generate_assets(ident: &syn::Ident, folder_path: String) -> quote::Tokens {
     let key = if std::path::MAIN_SEPARATOR == '\\' { key.replace('\\', "/") } else { key };
     let canonical_path_str = canonical_path.to_str();
     let value = quote!{
-      #key => Some(include_bytes!(#canonical_path_str).to_vec()),
+      #key => Some(&include_bytes!(#canonical_path_str)[..]),
     };
     values.push(value);
   }
   quote!{
       impl #ident {
-          pub fn get(file_path: &str) -> Option<Vec<u8>> {
+          pub fn get(file_path: &str) -> Option<impl AsRef<[u8]>> {
               match file_path {
                   #(#values)*
                   _ => None,
@@ -115,7 +115,11 @@ fn impl_rust_embed(ast: &syn::DeriveInput) -> Tokens {
     }
   };
   if !Path::new(&folder_path).exists() {
-    panic!("#[derive(RustEmbed)] folder '{}' does not exist. cwd: '{}'", folder_path, std::env::current_dir().unwrap().to_str().unwrap());
+    panic!(
+      "#[derive(RustEmbed)] folder '{}' does not exist. cwd: '{}'",
+      folder_path,
+      std::env::current_dir().unwrap().to_str().unwrap()
+    );
   };
   generate_assets(ident, folder_path)
 }