Merge pull request #433 from brave/code_structure_3

Code structure follow up #2

Author: boocmp

benches/bench_redirect_performance.rs

@@ -2,7 +2,7 @@ use criterion::*;
 use tokio::runtime::Runtime;
 
 use adblock::blocker::{Blocker, BlockerOptions};
-use adblock::filters::network::{NetworkFilter, NetworkFilterMask};
+use adblock::filters::network::{NetworkFilter, NetworkFilterMask, NetworkFilterMaskHelper};
 use adblock::request::Request;
 use adblock::resources::ResourceStorage;
 

src/blocker.rs

@@ -11,7 +11,7 @@ use thiserror::Error;
 #[cfg(feature = "object-pooling")]
 use lifeguard::Pool;
 
-use crate::filters::network::{NetworkFilter, NetworkMatchable};
+use crate::filters::network::{NetworkFilter, NetworkFilterMaskHelper, NetworkMatchable};
 use crate::optimizer;
 use crate::regex_manager::{RegexManager, RegexManagerDiscardPolicy};
 use crate::request::Request;

src/content_blocking.rs

@@ -1,7 +1,7 @@
 //! Transforms filter rules into content blocking syntax used on iOS and MacOS.
 
 use crate::filters::cosmetic::CosmeticFilter;
-use crate::filters::network::{NetworkFilter, NetworkFilterMask};
+use crate::filters::network::{NetworkFilter, NetworkFilterMask, NetworkFilterMaskHelper};
 use crate::lists::ParsedFilter;
 
 use memchr::{memchr as find_char, memmem};

src/data_format/v0.rs

@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::blocker::{Blocker, NetworkFilterList};
 use crate::cosmetic_filter_cache::{CosmeticFilterCache, HostnameRuleDb, ProceduralOrActionFilter};
-use crate::filters::network::NetworkFilter;
+use crate::filters::network::{NetworkFilter, NetworkFilterMaskHelper};
 use crate::utils::Hash;
 
 use super::utils::{stabilize_hashmap_serialization, stabilize_hashset_serialization};

src/filters/mod.rs

@@ -1,5 +1,7 @@
 //! Contains representations and standalone behaviors of individual filter rules.
 
 mod abstract_network;
+mod network_matchers;
+
 pub mod cosmetic;
 pub mod network;