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.

74744a7b — Tangent 128

Make RustEmbed trait static

Files changed (4) hide show

impl/src/lib.rs CHANGED Viewed

@@ -45,10 +45,10 @@ fn generate_assets(ident: &syn::Ident, folder_path: String) -> quote::Tokens {
           }
       }
       impl rust_embed::RustEmbed for #ident {
-        fn get(&self, file_path: &str) -> Option<std::borrow::Cow<'static, [u8]>> {
+        fn get(file_path: &str) -> Option<std::borrow::Cow<'static, [u8]>> {
           #ident::get(file_path)
         }
-        fn iter(&self) -> rust_embed::Filenames {
+        fn iter() -> rust_embed::Filenames {
           // the return type of iter() is unnamable, so we have to box it
           rust_embed::Filenames::Dynamic(Box::new(#ident::iter()))
         }
@@ -93,10 +93,10 @@ fn generate_assets(ident: &syn::Ident, folder_path: String) -> quote::Tokens {
           }
       }
       impl rust_embed::RustEmbed for #ident {
-        fn get(&self, file_path: &str) -> Option<std::borrow::Cow<'static, [u8]>> {
+        fn get(file_path: &str) -> Option<std::borrow::Cow<'static, [u8]>> {
           #ident::get(file_path)
         }
-        fn iter(&self) -> rust_embed::Filenames {
+        fn iter() -> rust_embed::Filenames {
           rust_embed::Filenames::Embedded(#ident::names())
         }
       }

readme.md CHANGED Viewed

@@ -45,10 +45,10 @@ impl Asset {
   }
 }
 impl RustEmbed for Asset {
-  fn get(&self, file_path: &str) -> Option<Cow<'static, [u8]>> {
+  fn get(file_path: &str) -> Option<Cow<'static, [u8]>> {
     ...
   }
-  fn iter(&self) -> impl Iterator<Item = Cow<'static, str>> {
+  fn iter() -> impl Iterator<Item = Cow<'static, str>> {
     ...
   }
 }

src/lib.rs CHANGED Viewed

@@ -33,7 +33,7 @@ pub trait RustEmbed {
   ///
   /// Otherwise, the bytes are read from the file system on each call and a
   /// `Cow::Owned(Vec<u8>)` is returned.
-  fn get(&self, file_path: &str) -> Option<std::borrow::Cow<'static, [u8]>>;
+  fn get(file_path: &str) -> Option<std::borrow::Cow<'static, [u8]>>;
   /// Iterates the files in this assets folder.
   ///
@@ -42,7 +42,7 @@ pub trait RustEmbed {
   /// is used.
   ///
   /// Otherwise, the files are listed from the file system on each call.
-  fn iter(&self) -> Filenames;
+  fn iter() -> Filenames;
 }
 /// An iterator type over filenames.

tests/lib.rs CHANGED Viewed

@@ -34,28 +34,14 @@ fn iter_works() {
 #[test]
 fn trait_works_generic() {
-  trait_works_generic_helper(&Asset);
+  trait_works_generic_helper::<Asset>();
 }
-fn trait_works_generic_helper(folder: &impl rust_embed::RustEmbed) {
+fn trait_works_generic_helper<E: rust_embed::RustEmbed>() {
   let mut num_files = 0;
-  for file in folder.iter() {
+  for file in E::iter() {
-    assert!(folder.get(file.as_ref()).is_some());
+    assert!(E::get(file.as_ref()).is_some());
     num_files += 1;
   }
   assert_eq!(num_files, 6);
-  assert!(folder.get("gg.html").is_none(), "gg.html should not exist");
+  assert!(E::get("gg.html").is_none(), "gg.html should not exist");
-}
-#[test]
-fn trait_works_object() {
-  trait_works_object_helper(&Asset);
-}
-fn trait_works_object_helper(folder: &dyn rust_embed::RustEmbed) {
-  let mut num_files = 0;
-  for file in folder.iter() {
-    assert!(folder.get(file.as_ref()).is_some());
-    num_files += 1;
-  }
-  assert_eq!(num_files, 6);
-  assert!(folder.get("gg.html").is_none(), "gg.html should not exist");
 }