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.

6af8ee20 — pyrossh

Fix RustEmbed::iter() signature

Files changed (3) hide show

impl/src/lib.rs CHANGED Viewed

@@ -93,7 +93,7 @@ fn embedded(
           }
           /// Iterates over the file paths in the folder.
-          pub fn iter() -> impl ::std::iter::Iterator<Item = ::std::borrow::Cow<'static, str>> {
+          pub fn iter() -> impl ::std::iter::Iterator<Item = ::std::borrow::Cow<'static, str>> + 'static {
               Self::names().map(|x| ::std::borrow::Cow::from(*x))
           }
       }
@@ -188,7 +188,7 @@ fn dynamic(
           }
           /// Iterates over the file paths in the folder.
-          pub fn iter() -> impl ::std::iter::Iterator<Item = ::std::borrow::Cow<'static, str>> {
+          pub fn iter() -> impl ::std::iter::Iterator<Item = ::std::borrow::Cow<'static, str>> + 'static {
               use ::std::path::Path;

src/lib.rs CHANGED Viewed

@@ -45,7 +45,7 @@ pub trait RustEmbed {
   /// is used.
   ///
   /// Otherwise, the files are listed from the file system on each call.
-  fn iter() -> impl Iterator<Item = std::borrow::Cow<'static, str>>;
+  fn iter() -> impl Iterator<Item = std::borrow::Cow<'static, str>> + 'static;
 }
 pub use RustEmbed as Embed;

tests/lib.rs CHANGED Viewed

@@ -56,3 +56,17 @@ fn trait_works_generic_helper<E: rust_embed::Embed>() {
   assert_eq!(num_files, 7);
   assert!(E::get("gg.html").is_none(), "gg.html should not exist");
 }
+/// Test that iter() can be boxed into a trait object.
+/// This is required for libraries like i18n-embed that need to return
+/// `Box<dyn Iterator<Item = String>>` from a trait implementation.
+#[test]
+fn iter_can_be_boxed() {
+  fn get_boxed_iter<E: rust_embed::Embed>() -> Box<dyn Iterator<Item = String>> {
+    Box::new(E::iter().map(|filename| filename.to_string()))
+  }
+  let filenames: Vec<String> = get_boxed_iter::<Asset>().collect();
+  assert_eq!(filenames.len(), 7);
+  assert!(filenames.contains(&"index.html".to_string()));
+}