fix: use macro to simplify defining Either type (#9)

Author: ChieloNewctle

src/lib.rs

@@ -1,5 +1,6 @@
 pub mod sam;
 pub mod trie;
+pub mod utils;
 
 use pyo3::prelude::*;
 

src/sam.rs

@@ -1,20 +1,14 @@
 extern crate general_sam as general_sam_rs;
 
 use crate::trie::Trie;
-
-use std::{str::from_utf8, sync::Arc};
-
-use either::{
-    for_both, Either as CharOrByte,
-    {Either::Left as CharSide, Either::Right as ByteSide},
-};
-use pyo3::{prelude::*, types::PyDict};
+use crate::utils::{char_or_byte_type, for_both, ByteSide, CharSide};
 
 use general_sam_rs::{sam as sam_rs, trie as trie_rs, trie_alike::TravelEvent};
+use pyo3::{prelude::*, types::PyDict};
+use std::{str::from_utf8, sync::Arc};
 
-type RustGeneralSAM = CharOrByte<sam_rs::GeneralSAM<char>, sam_rs::GeneralSAM<u8>>;
-type RustGeneralSAMState<'s> =
-    CharOrByte<sam_rs::GeneralSAMState<'s, char>, sam_rs::GeneralSAMState<'s, u8>>;
+type RustGeneralSAM = char_or_byte_type!(sam_rs::GeneralSAM);
+type RustGeneralSAMState<'s> = char_or_byte_type!(sam_rs::GeneralSAMState; 's);
 
 #[pyclass]
 pub struct GeneralSAM(pub Arc<RustGeneralSAM>);

src/trie.rs

@@ -1,20 +1,16 @@
 extern crate general_sam as general_sam_rs;
 
-use std::{convert::Infallible, str::from_utf8};
-
-use either::{
-    for_both, Either as CharOrByte,
-    {Either::Left as CharSide, Either::Right as ByteSide},
-};
-use pyo3::prelude::*;
+use crate::utils::{char_or_byte_type, for_both, ByteSide, CharSide};
 
 use general_sam_rs::{
     trie as trie_rs,
     trie_alike::{TravelEvent, TrieNodeAlike},
 };
+use pyo3::prelude::*;
+use std::{convert::Infallible, str::from_utf8};
 
-type RustTrie = CharOrByte<trie_rs::Trie<char>, trie_rs::Trie<u8>>;
-type RustTrieNode = CharOrByte<trie_rs::TrieNode<char>, trie_rs::TrieNode<u8>>;
+type RustTrie = char_or_byte_type!(trie_rs::Trie);
+type RustTrieNode = char_or_byte_type!(trie_rs::TrieNode);
 
 #[pyclass]
 pub struct Trie(pub RustTrie);

src/utils.rs

@@ -0,0 +1,16 @@
+pub use either::{
+    for_both, Either as CharOrByte,
+    {Either::Left as CharSide, Either::Right as ByteSide},
+};
+
+#[macro_export]
+macro_rules! char_or_byte_type {
+    ($( $name:ident )::+ $(; $( $life:lifetime ),* )?) => {
+        $crate::utils::CharOrByte<
+            $($name)::+ < $( $($life),* ,)? char>,
+            $($name)::+ < $( $($life),* ,)? u8>,
+        >
+    };
+}
+
+pub use char_or_byte_type;