From da9c676bbae2f8708a5feff0485f628164d049e3 Mon Sep 17 00:00:00 2001 From: breadrock Date: Fri, 5 Jul 2024 19:40:46 +0300 Subject: [PATCH] fix(fmt): Fixed fmt warnings --- adblock-rs/src/adblock.rs | 14 ++++++++------ adblock-rs/src/errors.rs | 2 +- adblock-rs/src/lib.rs | 12 +++++------- adblock-rs/src/wrapper.rs | 20 +++++++++++--------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/adblock-rs/src/adblock.rs b/adblock-rs/src/adblock.rs index d6c0a9f..ddd3352 100644 --- a/adblock-rs/src/adblock.rs +++ b/adblock-rs/src/adblock.rs @@ -1,6 +1,6 @@ -use adblock::{Engine, FilterSet}; use adblock::lists::ParseOptions; use adblock::request::Request; +use adblock::{Engine, FilterSet}; use crate::errors::RustException; @@ -55,11 +55,13 @@ mod adblock_test { ]; let advt_blocker = AdvtBlocker::new(rules); - let check_result = advt_blocker.check_network_urls( - "http://example.com/-advertisement-icon.", - "http://example.com/helloworld", - "image" - ).unwrap(); + let check_result = advt_blocker + .check_network_urls( + "http://example.com/-advertisement-icon.", + "http://example.com/helloworld", + "image", + ) + .unwrap(); assert_eq!(check_result, true); } diff --git a/adblock-rs/src/errors.rs b/adblock-rs/src/errors.rs index 132e7b2..1d1c060 100644 --- a/adblock-rs/src/errors.rs +++ b/adblock-rs/src/errors.rs @@ -1,7 +1,7 @@ use jni::errors::{Exception, ToException}; -use std::fmt::Debug; use adblock::request::RequestError; +use std::fmt::Debug; use thiserror::Error; #[derive(Debug, Error)] diff --git a/adblock-rs/src/lib.rs b/adblock-rs/src/lib.rs index 3f2a3c9..925095b 100644 --- a/adblock-rs/src/lib.rs +++ b/adblock-rs/src/lib.rs @@ -2,9 +2,9 @@ mod adblock; mod errors; mod wrapper; -use jni::JNIEnv; use jni::objects::{JObject, JObjectArray, JString}; use jni::sys::{jboolean, jlong}; +use jni::JNIEnv; use crate::wrapper::*; @@ -32,10 +32,8 @@ pub extern "system" fn Java_com_example_adblock_AdvtBlocker_checkNetworkUrls( src_url: JString, req_type: JString, ) -> jboolean { - check_net_urls_wrapped(&mut env, ptr, &url, &src_url, &req_type) - .unwrap_or_else(|err| { - log::error!("{:?}", err); - false as jboolean - }) + check_net_urls_wrapped(&mut env, ptr, &url, &src_url, &req_type).unwrap_or_else(|err| { + log::error!("{:?}", err); + false as jboolean + }) } - diff --git a/adblock-rs/src/wrapper.rs b/adblock-rs/src/wrapper.rs index 555fdec..724e36e 100644 --- a/adblock-rs/src/wrapper.rs +++ b/adblock-rs/src/wrapper.rs @@ -1,13 +1,13 @@ -use jni::JNIEnv; use jni::objects::{JObjectArray, JString}; use jni::sys::{jboolean, jlong}; +use jni::JNIEnv; use crate::adblock::AdvtBlocker; use crate::errors::RustException; pub(crate) fn init_object_wrapped( env: &mut JNIEnv, - rules: &JObjectArray + rules: &JObjectArray, ) -> Result { let conv_rules = extract_list_str(env, rules)?; Ok(AdvtBlocker::new(conv_rules)) @@ -29,12 +29,11 @@ pub(crate) fn check_net_urls_wrapped( let req_type_str = extract_str(env, req_type)?; - let check_result = advt_blocker - .check_network_urls( - url_str.as_str(), - src_url_str.as_str(), - req_type_str.as_str(), - )?; + let check_result = advt_blocker.check_network_urls( + url_str.as_str(), + src_url_str.as_str(), + req_type_str.as_str(), + )?; Ok(check_result as jboolean) } @@ -52,7 +51,10 @@ fn extract_str<'a>(env: &'a mut JNIEnv, j_obj: &'a JString) -> Result(env: &'a mut JNIEnv, j_obj_arr: &'a JObjectArray) -> Result, RustException> { +fn extract_list_str<'a>( + env: &'a mut JNIEnv, + j_obj_arr: &'a JObjectArray, +) -> Result, RustException> { let j_list = env .get_list(&j_obj_arr) .map_err(|err| RustException::ExtractParameter(err.to_string()))?;