Clean up.

Author: boocmp

src/data_format/mod.rs

@@ -9,9 +9,8 @@ mod v0;
 
 pub(crate) mod utils;
 
-use crate::cosmetic_filter_cache::CosmeticFilterCache;
-
 use crate::blocker::Blocker;
+use crate::cosmetic_filter_cache::CosmeticFilterCache;
 
 /// Newer formats start with this magic byte sequence.
 /// Calculated as the leading 4 bytes of `echo -n 'brave/adblock-rust' | sha512sum`.

src/data_format/v0.rs

@@ -9,6 +9,7 @@ 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::fb_network::flat::fb;
 use crate::filters::network::{NetworkFilter, NetworkFilterMaskHelper};
@@ -18,8 +19,6 @@ use crate::utils::Hash;
 use super::utils::{stabilize_hashmap_serialization, stabilize_hashset_serialization};
 use super::{DeserializationError, SerializationError};
 
-use crate::blocker::Blocker;
-
 /// Each variant describes a single rule that is specific to a particular hostname.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 enum LegacySpecificFilterType {

src/engine.rs

@@ -43,8 +43,8 @@ use std::collections::HashSet;
 /// [`Engine::hidden_class_id_selectors`] on an ongoing basis to determine additional elements that
 /// should be hidden dynamically.
 pub struct Engine {
-    pub(crate) blocker: Blocker,
-    pub(crate) cosmetic_cache: CosmeticFilterCache,
+    blocker: Blocker,
+    cosmetic_cache: CosmeticFilterCache,
     resources: ResourceStorage,
 }