From 5ca2f63253ad1eee55d44f59d84fff50a8fa642b Mon Sep 17 00:00:00 2001 From: Joe Hellerstein Date: Thu, 27 Jun 2024 16:08:40 -0700 Subject: [PATCH] clean up warnings --- hydroflow/tests/surface_lattice_bimorphism.rs | 4 ++-- hydroflow/tests/surface_lattice_generalized_hash_trie.rs | 2 -- lattices/src/ght.rs | 1 + lattices/src/ght_test.rs | 8 -------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/hydroflow/tests/surface_lattice_bimorphism.rs b/hydroflow/tests/surface_lattice_bimorphism.rs index ad1042765778..d6a2cdefaf8d 100644 --- a/hydroflow/tests/surface_lattice_bimorphism.rs +++ b/hydroflow/tests/surface_lattice_bimorphism.rs @@ -6,9 +6,9 @@ use lattices::ght::GeneralizedHashTrie; use lattices::ght_lattice::{DeepJoinLatticeBimorphism, GhtBimorphism}; use lattices::map_union::{KeyedBimorphism, MapUnionHashMap, MapUnionSingletonMap}; use lattices::set_union::{CartesianProductBimorphism, SetUnionHashSet, SetUnionSingletonSet}; -use lattices::{GhtNodeType, GhtType}; +use lattices::GhtType; use multiplatform_test::multiplatform_test; -use variadics::{var_expr, UnrefCloneVariadic}; +use variadics::var_expr; #[multiplatform_test] pub fn test_cartesian_product() { diff --git a/hydroflow/tests/surface_lattice_generalized_hash_trie.rs b/hydroflow/tests/surface_lattice_generalized_hash_trie.rs index 41c7f3609b66..b8470406fa38 100644 --- a/hydroflow/tests/surface_lattice_generalized_hash_trie.rs +++ b/hydroflow/tests/surface_lattice_generalized_hash_trie.rs @@ -4,7 +4,6 @@ use hydroflow::lattices::GhtType; use hydroflow::util::collect_ready; use hydroflow::variadics::{var_expr, var_type}; use lattices::ght_lattice::{DeepJoinLatticeBimorphism, GhtBimorphism}; -use lattices::GhtNodeType; #[test] fn test_basic() { @@ -46,7 +45,6 @@ fn test_join() { var_expr!(4, 40), ]; let s = vec![var_expr!(1, 100), var_expr!(5, 500)]; - type LeafProd = GhtNodeType!(u16 => u16); type MyNodeBim = <(MyGhtTrie, MyGhtTrie) as DeepJoinLatticeBimorphism>::DeepJoinLatticeBimorphism; diff --git a/lattices/src/ght.rs b/lattices/src/ght.rs index a4b514e83b0c..0df2d57661dd 100644 --- a/lattices/src/ght.rs +++ b/lattices/src/ght.rs @@ -492,6 +492,7 @@ where /// dependent column types. You pass it: /// - a list of key column types and dependent column type separated by a fat arrow, /// a la (K1, K2, K3 => T1, T2, T3) +/// /// This macro generates a hierarchy of GHT node types where each key column is associated with an GhtInner /// of the associated column type, and the remaining dependent columns are associated with a variadic HTleaf /// a la var_expr!(T1, T2, T3) diff --git a/lattices/src/ght_test.rs b/lattices/src/ght_test.rs index 92b7e0410c1d..d411d7fe9562 100644 --- a/lattices/src/ght_test.rs +++ b/lattices/src/ght_test.rs @@ -645,7 +645,6 @@ mod test { assert_eq!(k1, k2); } - use variadics::var_len; use variadics_macro::tuple; #[test] @@ -670,13 +669,6 @@ mod test { assert_eq!(tup, (&1, &2, &3)); } - #[test] - fn test_var_len() { - assert_eq!(1, var_len!((1, ()))); - assert_eq!(2, var_len!((1, (2, ())))); - assert_eq!(3, var_len!((1, (2, (3, ()))))); - } - use std::hash::BuildHasherDefault; #[test]