diff --git a/src/blocker.rs b/src/blocker.rs index fe31fb18..583627db 100644 --- a/src/blocker.rs +++ b/src/blocker.rs @@ -86,7 +86,7 @@ impl Blocker { self.check_parameterised(request, resources, false, false) } - pub(crate) fn get_list(&self, id: NetworkFilterListId) -> NetworkFilterList { + pub(crate) fn get_list(&self, id: NetworkFilterListId) -> NetworkFilterList<'_> { NetworkFilterList { list: self .filter_data_context @@ -98,40 +98,40 @@ impl Blocker { } } - pub(crate) fn csp(&self) -> NetworkFilterList { + pub(crate) fn csp(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::Csp) } - pub(crate) fn exceptions(&self) -> NetworkFilterList { + pub(crate) fn exceptions(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::Exceptions) } - pub(crate) fn importants(&self) -> NetworkFilterList { + pub(crate) fn importants(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::Importants) } - pub(crate) fn redirects(&self) -> NetworkFilterList { + pub(crate) fn redirects(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::Redirects) } - pub(crate) fn removeparam(&self) -> NetworkFilterList { + pub(crate) fn removeparam(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::RemoveParam) } - pub(crate) fn filters(&self) -> NetworkFilterList { + pub(crate) fn filters(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::Filters) } - pub(crate) fn generic_hide(&self) -> NetworkFilterList { + pub(crate) fn generic_hide(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::GenericHide) } - pub(crate) fn tagged_filters_all(&self) -> NetworkFilterList { + pub(crate) fn tagged_filters_all(&self) -> NetworkFilterList<'_> { self.get_list(NetworkFilterListId::TaggedFiltersAll) } #[cfg(feature = "single-thread")] - fn borrow_regex_manager(&self) -> std::cell::RefMut { + fn borrow_regex_manager(&self) -> std::cell::RefMut<'_, RegexManager> { #[allow(unused_mut)] let mut manager = self.regex_manager.borrow_mut(); @@ -142,7 +142,7 @@ impl Blocker { } #[cfg(not(feature = "single-thread"))] - fn borrow_regex_manager(&self) -> std::sync::MutexGuard { + fn borrow_regex_manager(&self) -> std::sync::MutexGuard<'_, RegexManager> { let mut manager = self.regex_manager.lock().unwrap(); manager.update_time(); manager diff --git a/src/filters/fb_network.rs b/src/filters/fb_network.rs index c6d7940c..6f7f1ef3 100644 --- a/src/filters/fb_network.rs +++ b/src/filters/fb_network.rs @@ -10,7 +10,14 @@ use crate::regex_manager::RegexManager; use crate::request::Request; use crate::utils::Hash; -#[allow(dead_code, clippy::all, unused_imports, unsafe_code)] +#[allow(unknown_lints)] +#[allow( + dead_code, + clippy::all, + unused_imports, + unsafe_code, + mismatched_lifetime_syntaxes +)] #[path = "../flatbuffers/fb_network_filter_generated.rs"] pub mod flat; use flat::fb; @@ -29,7 +36,7 @@ impl<'a> FlatPatterns<'a> { } #[inline(always)] - pub fn iter(&self) -> FlatPatternsIterator { + pub fn iter(&self) -> FlatPatternsIterator<'_> { FlatPatternsIterator { patterns: self, len: self.patterns.map_or(0, |d| d.len()), @@ -163,7 +170,7 @@ impl<'a> FlatNetworkFilter<'a> { } #[inline(always)] - pub fn patterns(&self) -> FlatPatterns { + pub fn patterns(&self) -> FlatPatterns<'_> { FlatPatterns::new(self.fb_filter.patterns()) } diff --git a/src/filters/network.rs b/src/filters/network.rs index 4698e689..921b8c96 100644 --- a/src/filters/network.rs +++ b/src/filters/network.rs @@ -363,7 +363,7 @@ impl FilterPart { } } - pub fn iter(&self) -> FilterPartIterator { + pub fn iter(&self) -> FilterPartIterator<'_> { FilterPartIterator { filter_part: self, index: 0, diff --git a/src/network_filter_list.rs b/src/network_filter_list.rs index c0d2f6dc..b4d1c761 100644 --- a/src/network_filter_list.rs +++ b/src/network_filter_list.rs @@ -66,7 +66,7 @@ type FlatNetworkFilterMap<'a> = FlatMultiMapView<'a, ShortHash, ForwardsUOffset>, &'a [ShortHash]>; impl NetworkFilterList<'_> { - pub fn get_filter_map(&self) -> FlatNetworkFilterMap { + pub fn get_filter_map(&self) -> FlatNetworkFilterMap<'_> { let filters_list = &self.list; FlatNetworkFilterMap::new( fb_vector_to_slice(filters_list.filter_map_index()), diff --git a/tests/live.rs b/tests/live.rs index 8cfa7a8c..402fd89c 100644 --- a/tests/live.rs +++ b/tests/live.rs @@ -24,9 +24,8 @@ fn load_requests() -> Vec { .from_reader(reader); let mut reqs: Vec = Vec::new(); - for result in rdr.deserialize() { - if result.is_ok() { - let record: RequestRuleMatch = result.unwrap(); + for result in rdr.deserialize::() { + if let Ok(record) = result { reqs.push(RequestRuleMatch { url: record.url.trim_matches('"').to_owned(), sourceUrl: record.sourceUrl.trim_matches('"').to_owned(), diff --git a/tests/matching.rs b/tests/matching.rs index 731967b8..1c6af9cd 100644 --- a/tests/matching.rs +++ b/tests/matching.rs @@ -74,8 +74,7 @@ fn check_filter_matching() { let request_res = Request::new(&req.url, &req.sourceUrl, &req.r#type); // The dataset has cases where URL is set to just "http://" or "https://", which we do not support - if request_res.is_ok() { - let request = request_res.unwrap(); + if let Ok(request) = request_res { assert!( network_filter.matches(&request, &mut RegexManager::default()), "Expected {} to match {} at {}, typed {}", @@ -104,8 +103,8 @@ fn check_engine_matching() { } for filter in req.filters { let opts = ParseOptions::default(); - let mut engine = Engine::from_rules_debug(&[filter.clone()], opts); - let resources = build_resources_from_filters(&[filter.clone()]); + let mut engine = Engine::from_rules_debug(std::slice::from_ref(&filter), opts); + let resources = build_resources_from_filters(std::slice::from_ref(&filter)); engine.use_resources(resources); let network_filter_res = NetworkFilter::parse(&filter, true, opts);