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.

c3fb0c4e — mbme

apply changes suggested in PR

Files changed (2) hide show

impl/src/lib.rs CHANGED Viewed

@@ -211,16 +211,11 @@ fn impl_rust_embed(ast: &syn::DeriveInput) -> TokenStream2 {
     _ => panic!("RustEmbed can only be derived for unit structs"),
   };
-  let folder_path: String = {
-    let mut it = find_attribute_values(ast, "folder").into_iter();
+  let mut folder_paths = find_attribute_values(ast, "folder");
-    match (it.next(), it.next()) {
-      (Some(folder_path), None) => folder_path,
+  if folder_paths.len() != 1 {
-      _ => {
-        panic!("#[derive(RustEmbed)] must contain one attribute like this #[folder = \"examples/public/\"]");
+    panic!("#[derive(RustEmbed)] must contain one attribute like this #[folder = \"examples/public/\"]");
-      }
+  }
-    }
-  };
+  let folder_path = folder_paths.remove(0);
   let prefix = find_attribute_values(ast, "prefix").into_iter().next();
   let includes = find_attribute_values(ast, "include");

utils/src/lib.rs CHANGED Viewed

@@ -14,7 +14,7 @@ pub struct FileEntry {
 #[cfg(not(feature = "include-exclude"))]
 pub fn is_path_included(_path: &str, _includes: &[&str], _excludes: &[&str]) -> bool {
-  return true;
+  true
 }
 #[cfg(feature = "include-exclude")]