fix: fix CI

Author: dnbln

src/dev/dir-structure-macros/src/dir_structure.rs

@@ -1,5 +1,3 @@
-use std::collections::HashSet;
-
 use proc_macro2::Ident;
 use proc_macro2::TokenStream;
 use quote::format_ident;
@@ -13,6 +11,7 @@ use syn::parse_quote;
 use crate::dir_structure_core::DirStructureCoreInfo;
 use crate::dir_structure_core::PathSpec;
 use crate::dir_structure_core::compile_attrs;
+use crate::merge_where_clause;
 
 struct DirStructureForField {
     read_code: TokenStream,
@@ -220,8 +219,8 @@ pub fn expand_dir_structure(st: ItemStruct) -> syn::Result<TokenStream> {
 
     let mut field_read_impls = Vec::new();
     let mut field_write_impls = Vec::new();
-    let mut read_bounds_b = HashSet::new();
-    let mut write_bounds_b = HashSet::new();
+    let mut read_bounds_b = Vec::new();
+    let mut write_bounds_b = Vec::new();
 
     for field in &st.fields {
         let DirStructureForField {
@@ -242,8 +241,8 @@ pub fn expand_dir_structure(st: ItemStruct) -> syn::Result<TokenStream> {
         write_bounds_b.extend(write_bounds);
     }
 
-    let where_read_clause = merge_where_clauses(where_clause, read_bounds_b);
-    let where_write_clause = merge_where_clauses(where_clause, write_bounds_b);
+    let where_read_clause = merge_where_clause(where_clause.cloned(), read_bounds_b);
+    let where_write_clause = merge_where_clause(where_clause.cloned(), write_bounds_b);
 
     let expanded = quote! {
         #[automatically_derived]
@@ -270,26 +269,3 @@ pub fn expand_dir_structure(st: ItemStruct) -> syn::Result<TokenStream> {
 
     Ok(expanded)
 }
-
-fn merge_where_clauses(
-    original: Option<&syn::WhereClause>,
-    additional: HashSet<WherePredicate>,
-) -> Option<syn::WhereClause> {
-    if original.is_none() && additional.is_empty() {
-        return None;
-    }
-    let mut predicates = if let Some(wc) = original {
-        wc.predicates.clone()
-    } else {
-        syn::punctuated::Punctuated::new()
-    };
-    for p in additional {
-        if !predicates.iter().any(|q| q == &p) {
-            predicates.push(p);
-        }
-    }
-    Some(syn::WhereClause {
-        where_token: Default::default(),
-        predicates,
-    })
-}

src/dev/dir-structure-macros/src/dir_structure_async/mod.rs

@@ -6,7 +6,6 @@ use syn::Expr;
 use syn::Field;
 use syn::ImplGenerics;
 use syn::ItemStruct;
-use syn::Token;
 use syn::Type;
 use syn::Variant;
 use syn::WherePredicate;
@@ -15,6 +14,7 @@ use syn::parse_quote;
 use crate::dir_structure_core::DirStructureCoreInfo;
 use crate::dir_structure_core::PathSpec;
 use crate::dir_structure_core::compile_attrs;
+use crate::merge_where_clause;
 
 mod read_from_async;
 mod write_to_async_ref;
@@ -355,26 +355,3 @@ pub fn expand_dir_structure_async(st: ItemStruct) -> syn::Result<TokenStream> {
 
     Ok(expanded)
 }
-
-use syn::punctuated::Punctuated;
-
-fn merge_where_clause(
-    where_clause: Option<syn::WhereClause>,
-    additional_bounds: Vec<syn::WherePredicate>,
-) -> Option<syn::WhereClause> {
-    if let Some(mut where_clause) = where_clause {
-        where_clause.predicates.extend(additional_bounds);
-        Some(where_clause)
-    } else {
-        let mut where_clause = syn::WhereClause {
-            where_token: <Token![where]>::default(),
-            predicates: Punctuated::new(),
-        };
-        where_clause.predicates.extend(additional_bounds);
-        if where_clause.predicates.is_empty() {
-            None
-        } else {
-            Some(where_clause)
-        }
-    }
-}

src/dev/dir-structure-macros/src/lib.rs

@@ -1,4 +1,5 @@
 use syn::ItemStruct;
+use syn::punctuated::Punctuated;
 
 mod dir_structure;
 #[cfg(feature = "async")]
@@ -73,3 +74,24 @@ pub fn include_dir_patched(input: proc_macro::TokenStream) -> proc_macro::TokenS
     let input = syn::parse_macro_input!(input as syn::LitStr);
     quote::quote! {::dir_structure::include_dir::include_dir!(#input)}.into()
 }
+
+fn merge_where_clause(
+    where_clause: Option<syn::WhereClause>,
+    additional_bounds: Vec<syn::WherePredicate>,
+) -> Option<syn::WhereClause> {
+    if let Some(mut where_clause) = where_clause {
+        where_clause.predicates.extend(additional_bounds);
+        Some(where_clause)
+    } else {
+        let mut where_clause = syn::WhereClause {
+            where_token: <syn::Token![where]>::default(),
+            predicates: Punctuated::new(),
+        };
+        where_clause.predicates.extend(additional_bounds);
+        if where_clause.predicates.is_empty() {
+            None
+        } else {
+            Some(where_clause)
+        }
+    }
+}

src/dev/dir-structure/src/traits/asy.rs

@@ -57,7 +57,7 @@ pub trait WriteToAsync<'a, Vfs: WriteSupportingVfsAsync + ?Sized + 'a> {
 ///
 /// The difference between this and [`WriteToAsync`] is that this trait takes in
 /// a reference instead of owned data.
-/// 
+///
 /// This is an async equivalent of [`WriteTo`](crate::traits::sync::WriteTo).
 #[cfg(feature = "async")]
 #[cfg_attr(docsrs, doc(cfg(feature = "async")))]