fix: address review comments

hydro-project · Oct 25, 2024 · 37d1f26 · 37d1f26
1 parent 24454c3
commit 37d1f26
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lattices/Cargo.toml b/lattices/Cargo.toml
@@ -22,7 +22,6 @@ lattices_macro = { path = "../lattices_macro", version = "^0.5.6" }
 ref-cast = "1.0.23"
 variadics = { path = "../variadics", version = "^0.0.6" }
 variadics_macro = { path = "../variadics_macro", version = "^0.5.5" }
-fnv = "1.0.7"
 
 [dev-dependencies]
 trybuild = "1.0.0"
diff --git a/lattices/src/ght_lazy.rs b/lattices/src/ght_lazy.rs
@@ -221,23 +221,14 @@ where
     <Schema as SplitBySuffix<ValType>>::Prefix: Eq + Hash + Clone,
     GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>:
         GeneralizedHashTrieNode<Head = Head> + GhtGet,
-    // Rest: ColtNode<Head = Head>,
-    // Head: Eq + Hash + Clone,
-    // Head2: Eq + Hash + Clone,
-    // Node: GeneralizedHashTrieNode,
-    GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>: GeneralizedHashTrieNode<
-        Head = Rest::Head,
-        // SuffixSchema = Rest::SuffixSchema,
-        Schema = Rest::Schema,
-        Storage = Rest::Storage,
-    >,
+    GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>:
+        GeneralizedHashTrieNode<Head = Rest::Head, Schema = Rest::Schema, Storage = Rest::Storage>,
     GhtLeaf<Schema, ValType, Storage>:
         GeneralizedHashTrieNode<Schema = Rest::Schema, Storage = Rest::Storage> + GhtGet,
 {
     type Schema = Rest::Schema;
     type Head = Rest::Head;
     type SuffixSchema = Rest::SuffixSchema;
-    // type Get = Rest::Get; // Option<&'a <GhtLeaf<Schema, ValType> as GhtGet>::Get>,
     type Get = var_type!(&'a mut GhtLeaf<Schema, ValType, Storage>, ...Rest::Get);
     type Storage = Rest::Storage;
 
@@ -299,9 +290,8 @@ where
 }
 impl<Head, Schema, ValType, Storage> ColtGetTail<GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>> for var_type!(&mut GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>)
 where
-    GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>: GeneralizedHashTrieNode<Head = Head>
-        // + crate::Merge<GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>>
-        + GhtGet,
+    GhtInner<Head, GhtLeaf<Schema, ValType, Storage>>:
+        GeneralizedHashTrieNode<Head = Head> + GhtGet,
     GhtLeaf<Schema, ValType, Storage>: GeneralizedHashTrieNode<Schema = Schema, Storage = Storage>,
     Head: Clone + Eq + Hash,
     Schema: Clone + Eq + Hash + VariadicExt,

diff --git a/lattices/src/ght_test.rs b/lattices/src/ght_test.rs
@@ -465,11 +465,10 @@ mod test {
         assert_eq!(tup, (&1, &2, &3));
     }
 
-    use std::hash::BuildHasherDefault;
+    use std::hash::{BuildHasherDefault, DefaultHasher};
 
     #[test]
     fn test_triangle_generic_join() {
-        use fnv::FnvHasher;
         const MATCHES: u32 = 1000;
         type MyGht = GhtType!(u32 => u32: VariadicCountedHashSet);
 
@@ -492,11 +491,11 @@ mod test {
         let r_x = r_iter
             .clone()
             .map(|(x, _y)| x)
-            .collect::<HashSet<_, BuildHasherDefault<FnvHasher>>>();
+            .collect::<HashSet<_, BuildHasherDefault<DefaultHasher>>>();
         let t_x = s_iter
             .clone()
             .map(|(_z, x)| x)
-            .collect::<HashSet<_, BuildHasherDefault<FnvHasher>>>();
+            .collect::<HashSet<_, BuildHasherDefault<DefaultHasher>>>();
         let x_inter = r_x.intersection(&t_x);
         let len = x_inter.clone().count();
         if len > 1 {
@@ -512,11 +511,11 @@ mod test {
             let r = rx_ght
                 .prefix_iter(var_expr!(a))
                 .map(|(_x, (y, ()))| *y)
-                .collect::<HashSet<_, BuildHasherDefault<FnvHasher>>>();
+                .collect::<HashSet<_, BuildHasherDefault<DefaultHasher>>>();
             let s_y = s_iter
                 .clone()
                 .map(|(y, _z)| y)
-                .collect::<HashSet<_, BuildHasherDefault<FnvHasher>>>();
+                .collect::<HashSet<_, BuildHasherDefault<DefaultHasher>>>();
             let y_inter = r.intersection(&s_y);
             let len = y_inter.clone().count();
             if len > 1 {
@@ -527,11 +526,11 @@ mod test {
                 let s = sb_ght
                     .prefix_iter(var_expr!(b))
                     .map(|(_b, (z, ()))| *z)
-                    .collect::<HashSet<_, BuildHasherDefault<FnvHasher>>>();
+                    .collect::<HashSet<_, BuildHasherDefault<DefaultHasher>>>();
                 let t = tx_ght
                     .prefix_iter(var_expr!(a))
                     .map(|(_x, (z, ()))| *z)
-                    .collect::<HashSet<_, BuildHasherDefault<FnvHasher>>>();
+                    .collect::<HashSet<_, BuildHasherDefault<DefaultHasher>>>();
                 let z_inter = s.intersection(&t);
                 let len = z_inter.clone().count();
                 if len > 1 {

diff --git a/variadics_macro/README.md b/variadics_macro/README.md
@@ -3,7 +3,7 @@
 Create a tuple from a Variadic type known at compile time.
 
 Example usage:
-```
+```rust
 use variadics::var_expr;
 use variadics_macro::tuple;
 

diff --git a/variadics_macro/src/lib.rs b/variadics_macro/src/lib.rs
@@ -25,7 +25,6 @@ impl Parse for InputLen {
 pub fn tuple(ts: TokenStream) -> TokenStream {
     let InputLen { input, len } = parse_macro_input!(ts as InputLen);
     let len = len.base10_parse::<usize>().unwrap();
-    // let pattern = gen_pattern(len, 1);
     let pattern = (0..len)
         .rev()
         .map(|i| format_ident!("x{}", i))