moves resources into a module

native/src/lib.rs

@@ -11,7 +11,7 @@ use std::path::Path;
 use adblock::engine::Engine;
 use adblock::filter_lists;
 use adblock::resources::Resource;
-use adblock::resource_assembler::{assemble_web_accessible_resources, assemble_scriptlet_resources};
+use adblock::resources::resource_assembler::{assemble_web_accessible_resources, assemble_scriptlet_resources};
 
 
 #[derive(Serialize, Deserialize)]

src/blocker.rs

@@ -11,8 +11,7 @@ use crate::filters::network::{NetworkFilter, NetworkMatchable, FilterError};
 use crate::request::Request;
 use crate::utils::{fast_hash, Hash};
 use crate::optimizer;
-use crate::resources::Resource;
-use crate::redirect_resources::{RedirectResourceStorage, RedirectResource};
+use crate::resources::{Resource, RedirectResourceStorage, RedirectResource};
 use crate::utils;
 
 pub struct BlockerOptions {

src/engine.rs

@@ -3,8 +3,7 @@ use crate::blocker::{Blocker, BlockerError, BlockerOptions, BlockerResult};
 use crate::lists::parse_filters;
 use crate::request::Request;
 use crate::filters::network::NetworkFilter;
-use crate::resources::Resource;
-use crate::redirect_resources::{RedirectResource};
+use crate::resources::{Resource, RedirectResource};
 use rmps;
 use flate2::write::GzEncoder;
 use flate2::read::GzDecoder;

src/lib.rs

@@ -29,6 +29,4 @@ pub mod optimizer;
 pub mod url_parser;
 pub mod engine;
 pub mod filter_lists;
-pub mod redirect_resources;
 pub mod resources;
-pub mod resource_assembler;