Merge pull request #1128 from sozu-proxy/remove-router-trie

remove sozu_lib::router::trie and replace use with pattern_trie

command/src/certificate.rs

@@ -108,7 +108,7 @@ impl FromStr for TlsVersion {
 
 //FIXME: make fixed size depending on hash algorithm
 /// A TLS certificates, encoded in bytes
-#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Default)]
 pub struct Fingerprint(pub Vec<u8>);
 
 impl FromStr for Fingerprint {

lib/src/https.rs

@@ -1508,7 +1508,7 @@ mod tests {
         proto::command::{CustomHttpAnswers, SocketAddress},
     };
 
-    use crate::router::{trie::TrieNode, MethodRule, PathRule, Route, Router};
+    use crate::router::{pattern_trie::TrieNode, MethodRule, PathRule, Route, Router};
 
     /*
     #[test]

lib/src/router/mod.rs

@@ -1,5 +1,4 @@
 pub mod pattern_trie;
-pub mod trie;
 
 use std::{str::from_utf8, time::Instant};
 

lib/src/router/pattern_trie.rs

@@ -34,7 +34,7 @@ fn find_last_slash(input: &[u8]) -> Option<usize> {
 /// A leaf node (leftmost label) can be a wildcard, a regex pattern or a plain string.
 /// Leaves also store a value associated with the complete domain.
 /// For Sozu it is a list of (PathRule, MethodRule, ClusterId). See the Router strucure.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct TrieNode<V> {
     key_value: Option<KeyValue<Key, V>>,
     wildcard: Option<KeyValue<Key, V>>,