move Engine to top-level export

benches/bench_matching.rs

@@ -2,8 +2,8 @@ use criterion::*;
 
 use serde::{Deserialize, Serialize};
 
+use adblock::Engine;
 use adblock::blocker::{Blocker, BlockerOptions};
-use adblock::engine::Engine;
 use adblock::request::Request;
 use adblock::resources::ResourceStorage;
 use adblock::url_parser::parse_url;

examples/deserialization.rs

@@ -1,5 +1,7 @@
-use adblock::engine::Engine;
-use adblock::request::Request;
+use adblock::{
+    Engine,
+    request::Request,
+};
 
 use serde::Deserialize;
 

examples/example.rs

@@ -1,6 +1,8 @@
-use adblock::engine::Engine;
-use adblock::lists::{FilterSet, ParseOptions};
-use adblock::request::Request;
+use adblock::{
+    Engine,
+    lists::{FilterSet, ParseOptions},
+    request::Request,
+};
 
 fn main() {
     let rules = vec![

examples/generate-dat.rs

@@ -1,5 +1,7 @@
-use adblock::engine::Engine;
-use adblock::request::Request;
+use adblock::{
+    Engine,
+    request::Request,
+};
 
 use std::fs::File;
 use std::io::prelude::*;

examples/use-dat.rs

@@ -1,5 +1,7 @@
-use adblock::engine::Engine;
-use adblock::request::Request;
+use adblock::{
+    Engine,
+    request::Request,
+};
 
 use std::fs::File;
 use std::io::prelude::*;

js/src/lib.rs

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use std::cell::RefCell;
 use std::sync::Mutex;
 use std::path::Path;
-use adblock::engine::Engine as EngineInternal;
+use adblock::Engine as EngineInternal;
 use adblock::lists::{RuleTypes, FilterFormat, FilterListMetadata, FilterSet as FilterSetInternal, ParseOptions};
 use adblock::resources::Resource;
 use adblock::resources::resource_assembler::assemble_web_accessible_resources;

src/engine.rs

@@ -43,7 +43,7 @@ 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 blocker: Blocker,
+    blocker: Blocker,
     cosmetic_cache: CosmeticFilterCache,
     resources: ResourceStorage,
 }

src/lib.rs

@@ -21,7 +21,7 @@ pub mod blocker;
 pub mod content_blocking;
 pub mod cosmetic_filter_cache;
 mod data_format;
-pub mod engine;
+mod engine;
 pub mod filters;
 pub mod lists;
 mod optimizer;

tests/deserialization.rs

@@ -1,4 +1,4 @@
-use adblock::engine::Engine;
+use adblock::Engine;
 use adblock::request::Request;
 
 use serde::Deserialize;

tests/legacy_harness.rs

@@ -304,7 +304,7 @@ mod legacy_test_filters {
 }
 
 mod legacy_check_match {
-    use adblock::engine::Engine;
+    use adblock::Engine;
     use adblock::request::Request;
 
     fn check_match<'a>(
@@ -490,7 +490,7 @@ mod legacy_check_match {
 }
 
 mod legacy_check_options {
-    use adblock::engine::Engine;
+    use adblock::Engine;
     use adblock::request::Request;
 
     fn check_option_rule<'a>(rules: &[&'a str], tests: &[(&'a str, &'a str, &'a str, bool)]) {
@@ -647,7 +647,7 @@ mod legacy_check_options {
 }
 
 mod legacy_misc_tests {
-    use adblock::engine::Engine;
+    use adblock::Engine;
     use adblock::filters::network::NetworkFilter;
     use adblock::request::Request;
 

tests/live.rs

@@ -1,4 +1,4 @@
-use adblock::engine::Engine;
+use adblock::Engine;
 use adblock::request::Request;
 
 use serde::Deserialize;

tests/matching.rs

@@ -1,4 +1,4 @@
-use adblock::engine::Engine;
+use adblock::Engine;
 use adblock::filters::network::NetworkFilter;
 use adblock::filters::network::NetworkMatchable;
 use adblock::regex_manager::RegexManager;

tests/simple_use.rs

@@ -1,4 +1,4 @@
-use adblock::engine::Engine;
+use adblock::Engine;
 use adblock::request::Request;
 
 #[test]

tests/ublock-coverage.rs

@@ -1,4 +1,4 @@
-use adblock::engine::Engine;
+use adblock::Engine;
 use adblock::request::Request;
 
 use serde::Deserialize;