Blocker type for data_format lib.

Author: boocmp

src/data_format/mod.rs

@@ -9,9 +9,10 @@ mod v0;
 
 pub(crate) mod utils;
 
-use crate::blocker::Blocker;
 use crate::cosmetic_filter_cache::CosmeticFilterCache;
 
+type Blocker = crate::blocker::GenericBlocker<crate::network_filter_list::NetworkFilterList>;
+
 /// Newer formats start with this magic byte sequence.
 /// Calculated as the leading 4 bytes of `echo -n 'brave/adblock-rust' | sha512sum`.
 const ADBLOCK_RUST_DAT_MAGIC: [u8; 4] = [0xd1, 0xd9, 0x3a, 0xaf];

src/data_format/v0.rs

@@ -9,7 +9,6 @@ use std::collections::{HashMap, HashSet};
 use rmp_serde as rmps;
 use serde::{Deserialize, Serialize};
 
-use crate::blocker::Blocker;
 use crate::cosmetic_filter_cache::{CosmeticFilterCache, HostnameRuleDb, ProceduralOrActionFilter};
 use crate::filters::network::{NetworkFilter, NetworkFilterMaskHelper};
 use crate::network_filter_list::NetworkFilterList;
@@ -18,6 +17,8 @@ use crate::utils::Hash;
 use super::utils::{stabilize_hashmap_serialization, stabilize_hashset_serialization};
 use super::{DeserializationError, SerializationError};
 
+type Blocker = crate::blocker::GenericBlocker<crate::network_filter_list::NetworkFilterList>;
+
 /// Each variant describes a single rule that is specific to a particular hostname.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 enum LegacySpecificFilterType {