move hash enum to make them easier to find

rapidfuzz · Nov 26, 2023 · b9f3817 · b9f3817
1 parent 8f42527
commit b9f3817
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 24 deletions.
diff --git a/src/details/common.rs b/src/details/common.rs
@@ -1,20 +1,11 @@
+use crate::{Hash, HashableChar};
 use std::iter::{Skip, Take};
 
 pub fn norm_sim_to_norm_dist(score_cutoff: f64) -> f64 {
     let imprecision = 0.00001;
     (1.0 - score_cutoff + imprecision).min(1.0)
 }
 
-#[derive(Debug, Copy, Clone)]
-pub enum Hash {
-    UNSIGNED(u64),
-    SIGNED(i64),
-}
-
-pub trait HashableChar {
-    fn hash_char(&self) -> Hash;
-}
-
 macro_rules! impl_hashable_char {
     ($base_type:ty, $kind:tt $(, $t:ty)*) => {
         impl HashableChar for $base_type {

diff --git a/src/details/distance.rs b/src/details/distance.rs
@@ -1,4 +1,5 @@
-use crate::details::common::{norm_sim_to_norm_dist, HashableChar};
+use crate::details::common::norm_sim_to_norm_dist;
+use crate::HashableChar;
 
 pub trait MetricUsize {
     fn maximum(&self, len1: usize, len2: usize) -> usize;

diff --git a/src/details/growing_hashmap.rs b/src/details/growing_hashmap.rs
@@ -1,4 +1,4 @@
-use crate::details::common::{Hash, HashableChar};
+use crate::{Hash, HashableChar};
 
 #[derive(Default, Clone)]
 struct GrowingHashmapMapElem<ValueType> {

diff --git a/src/details/pattern_match_vector.rs b/src/details/pattern_match_vector.rs
@@ -1,6 +1,6 @@
-use crate::details::common::{Hash, HashableChar};
 use crate::details::intrinsics::ceil_div_usize;
 use crate::details::matrix::BitMatrix;
+use crate::{Hash, HashableChar};
 
 #[derive(Clone, Copy, Default)]
 struct BitvectorHashmapMapElem {

diff --git a/src/distance/damerau_levenshtein.rs b/src/distance/damerau_levenshtein.rs
@@ -50,9 +50,10 @@
 //! ![benchmark results](https://raw.githubusercontent.com/maxbachmann/rapidfuzz-rs/main/doc/bench/damerau_levenshtein.svg)
 //!
 
-use crate::details::common::{remove_common_affix, HashableChar};
+use crate::details::common::remove_common_affix;
 use crate::details::distance::MetricUsize;
 use crate::details::growing_hashmap::{GrowingHashmap, HybridGrowingHashmap};
+use crate::HashableChar;
 use std::cmp::{max, min};
 use std::mem;
 

diff --git a/src/distance/hamming.rs b/src/distance/hamming.rs
@@ -1,5 +1,5 @@
-use crate::details::common::HashableChar;
 use crate::details::distance::MetricUsize;
+use crate::HashableChar;
 
 use std::error;
 use std::fmt::{self, Display, Formatter};

diff --git a/src/distance/indel.rs b/src/distance/indel.rs
@@ -1,7 +1,7 @@
-use crate::details::common::HashableChar;
 use crate::details::distance::MetricUsize;
 use crate::details::pattern_match_vector::BlockPatternMatchVector;
 use crate::distance::lcs_seq;
+use crate::HashableChar;
 
 pub(crate) struct IndividualComparator;
 

diff --git a/src/distance/jaro.rs b/src/distance/jaro.rs
@@ -1,10 +1,11 @@
-use crate::details::common::{find_common_prefix, HashableChar};
+use crate::details::common::find_common_prefix;
 use crate::details::distance::Metricf64;
 use crate::details::intrinsics::{bit_mask_lsb_u64, blsi_u64, blsr_u64, ceil_div_usize};
 use crate::details::pattern_match_vector::{
     BitVectorInterface, BlockPatternMatchVector, PatternMatchVector,
 };
 use crate::Hash;
+use crate::HashableChar;
 use std::cmp::min;
 
 struct FlaggedCharsWord {

diff --git a/src/distance/jaro_winkler.rs b/src/distance/jaro_winkler.rs
@@ -1,6 +1,6 @@
-use crate::details::common::HashableChar;
 use crate::details::distance::Metricf64;
 use crate::details::pattern_match_vector::BlockPatternMatchVector;
+use crate::HashableChar;
 
 use crate::distance::jaro;
 

diff --git a/src/distance/lcs_seq.rs b/src/distance/lcs_seq.rs
@@ -1,10 +1,11 @@
-use crate::details::common::{remove_common_affix, HashableChar};
+use crate::details::common::remove_common_affix;
 use crate::details::distance::MetricUsize;
 use crate::details::intrinsics::{carrying_add, ceil_div_usize};
 use crate::details::matrix::ShiftedBitMatrix;
 use crate::details::pattern_match_vector::{
     BitVectorInterface, BlockPatternMatchVector, PatternMatchVector,
 };
+use crate::HashableChar;
 use std::cmp::{max, min};
 
 #[derive(Default)]

diff --git a/src/distance/levenshtein.rs b/src/distance/levenshtein.rs
@@ -1,4 +1,4 @@
-use crate::details::common::{remove_common_affix, HashableChar};
+use crate::details::common::remove_common_affix;
 use crate::details::distance::MetricUsize;
 use crate::details::growing_hashmap::{GrowingHashmap, HybridGrowingHashmap};
 use crate::details::intrinsics::{ceil_div_usize, shr64};
@@ -7,6 +7,7 @@ use crate::details::pattern_match_vector::{
     BitVectorInterface, BlockPatternMatchVector, PatternMatchVector,
 };
 use crate::distance::indel;
+use crate::HashableChar;
 use std::cmp::{max, min};
 use std::mem;
 

diff --git a/src/distance/osa.rs b/src/distance/osa.rs
@@ -1,8 +1,9 @@
-use crate::details::common::{remove_common_affix, HashableChar};
+use crate::details::common::remove_common_affix;
 use crate::details::distance::MetricUsize;
 use crate::details::pattern_match_vector::{
     BitVectorInterface, BlockPatternMatchVector, PatternMatchVector,
 };
+use crate::HashableChar;
 use std::mem;
 
 /// Bitparallel implementation of the OSA distance.

diff --git a/src/distance/postfix.rs b/src/distance/postfix.rs
@@ -1,5 +1,6 @@
-use crate::details::common::{find_common_suffix, HashableChar};
+use crate::details::common::find_common_suffix;
 use crate::details::distance::MetricUsize;
+use crate::HashableChar;
 
 struct IndividualComparator;
 

diff --git a/src/distance/prefix.rs b/src/distance/prefix.rs
@@ -1,5 +1,6 @@
-use crate::details::common::{find_common_prefix, HashableChar};
+use crate::details::common::find_common_prefix;
 use crate::details::distance::MetricUsize;
+use crate::HashableChar;
 
 struct IndividualComparator;
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -4,4 +4,12 @@ pub(crate) mod details;
 pub mod distance;
 pub mod fuzz;
 
-pub use crate::details::common::{Hash, HashableChar};
+#[derive(Debug, Copy, Clone)]
+pub enum Hash {
+    UNSIGNED(u64),
+    SIGNED(i64),
+}
+
+pub trait HashableChar {
+    fn hash_char(&self) -> Hash;
+}