Skip to content

style: simplify some statements for readability #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

style: simplify some statements for readability #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions benches/bench_redirect_performance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn get_redirect_rules() -> Vec<NetworkFilter> {
.map(|(index, mut rule)| {
rule.mask.insert(NetworkFilterMask::IS_LEFT_ANCHOR);
rule.mask.insert(NetworkFilterMask::IS_RIGHT_ANCHOR);
rule.hostname = Some(format!("a{}.com/bad.js", index));
rule.hostname = Some(format!("a{index}.com/bad.js"));

rule.filter = adblock::filters::network::FilterPart::Empty;
rule.mask.remove(NetworkFilterMask::IS_HOSTNAME_ANCHOR);
Expand Down Expand Up @@ -211,7 +211,7 @@ pub fn build_custom_requests(rules: Vec<NetworkFilter>) -> Vec<Request> {
hostname
};

let source_url = format!("https://{}", source_hostname);
let source_url = format!("https://{source_hostname}");

Request::new(
&url,
Expand All @@ -225,7 +225,7 @@ pub fn build_custom_requests(rules: Vec<NetworkFilter>) -> Vec<Request> {
fn bench_fn(blocker: &Blocker, resources: &ResourceStorage, requests: &[Request]) {
requests.iter().for_each(|request| {
let block_result = blocker.check(&request, &resources);
assert!(block_result.redirect.is_some(), "{:?}, {:?}", request, block_result);
assert!(block_result.redirect.is_some(), "{request:?}, {block_result:?}");
});
}

Expand Down
6 changes: 3 additions & 3 deletions examples/deserialization.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn load_requests() -> Vec<RequestRuleMatch> {
if let Ok(record) = result {
reqs.push(record);
} else {
println!("Could not parse {:?}", result);
println!("Could not parse {result:?}");
}
}

Expand Down Expand Up @@ -74,7 +74,7 @@ fn main() {
let mut reqs_processed = 0;
for req in requests {
if reqs_processed % 10000 == 0 {
println!("{} requests processed", reqs_processed);
println!("{reqs_processed} requests processed");
}
let request = Request::new(&req.url, &req.sourceUrl, &req.r#type).unwrap();
let checked = engine.check_network_request(&request);
Expand Down Expand Up @@ -111,7 +111,7 @@ fn main() {

let mismatches = mismatch_expected_match + mismatch_expected_exception + mismatch_expected_pass;
let ratio = mismatches as f32 / requests_len as f32;
assert!(ratio < 0.04, "Mismatch ratio was {}", ratio);
assert!(ratio < 0.04, "Mismatch ratio was {ratio}");
assert!(
false_positive_rules.len() < 3,
"False positive rules higher than expected: {:?}",
Expand Down
2 changes: 1 addition & 1 deletion examples/example.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ fn main() {
).unwrap();
let blocker_result = engine.check_network_request(&request);

println!("Blocker result: {:?}", blocker_result);
println!("Blocker result: {blocker_result:?}");
}
2 changes: 1 addition & 1 deletion examples/use-dat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ fn main() {
let checked = engine.check_network_request(&request);
assert!(checked.filter.is_some());
assert!(checked.exception.is_some());
println!("All good: {:?}", checked);
println!("All good: {checked:?}");
}
10 changes: 5 additions & 5 deletions src/blocker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ impl Blocker {
impl<'a> std::fmt::Display for QParam<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::KeyOnly(k) => write!(f, "{}", k),
Self::KeyValue(k, v) => write!(f, "{}={}", k, v),
Self::KeyOnly(k) => write!(f, "{k}"),
Self::KeyValue(k, v) => write!(f, "{k}={v}"),
}
}
}
Expand Down Expand Up @@ -418,7 +418,7 @@ impl Blocker {
let new_param_str = if p.is_empty() {
String::from("")
} else {
format!("?{}", p)
format!("?{p}")
};
Some(format!("{}{}{}", &url[0..i], new_param_str, &url[hash_index..]))
} else {
Expand Down Expand Up @@ -1778,7 +1778,7 @@ mod blocker_tests {
"bsft_uid", "bsft_clkid",
"vgo_ee",
"igshid",
].iter().map(|s| format!("*$removeparam={}", s)).collect::<Vec<_>>();
].iter().map(|s| format!("*$removeparam={s}")).collect::<Vec<_>>();

let (network_filters, _) = parse_filters(&filters, true, Default::default());

Expand All @@ -1796,7 +1796,7 @@ mod blocker_tests {
} else {
Some(expected.to_string())
};
assert_eq!(expected, result.rewritten_url, "Filtering parameters on {} failed", original);
assert_eq!(expected, result.rewritten_url, "Filtering parameters on {original} failed");
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/cosmetic_filter_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,18 @@ impl CosmeticFilterCache {
classes.into_iter().for_each(|class| {
let class = class.as_ref();
if self.simple_class_rules.contains(class)
&& !exceptions.contains(&format!(".{}", class))
&& !exceptions.contains(&format!(".{class}"))
{
selectors.push(format!(".{}", class));
selectors.push(format!(".{class}"));
}
if let Some(bucket) = self.complex_class_rules.get(class) {
selectors.extend(bucket.iter().filter(|sel| !exceptions.contains(*sel)).map(|s| s.to_owned()));
}
});
ids.into_iter().for_each(|id| {
let id = id.as_ref();
if self.simple_id_rules.contains(id) && !exceptions.contains(&format!("#{}", id)) {
selectors.push(format!("#{}", id));
if self.simple_id_rules.contains(id) && !exceptions.contains(&format!("#{id}")) {
selectors.push(format!("#{id}"));
}
if let Some(bucket) = self.complex_id_rules.get(id) {
selectors.extend(bucket.iter().filter(|sel| !exceptions.contains(*sel)).map(|s| s.to_owned()));
Expand Down
30 changes: 15 additions & 15 deletions src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ mod tests {
let request = Request::new(&url, "", "").unwrap();
let matched_rule = engine.check_network_request(&request);
if expected_result {
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
} else {
assert!(!matched_rule.matched, "Expected no match for {}, matched with {:?}", url, matched_rule.filter);
}
Expand Down Expand Up @@ -310,7 +310,7 @@ mod tests {
let request = Request::new(&url, "", "").unwrap();
let matched_rule = engine.check_network_request(&request);
if expected_result {
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
} else {
assert!(!matched_rule.matched, "Expected no match for {}, matched with {:?}", url, matched_rule.filter);
}
Expand All @@ -336,7 +336,7 @@ mod tests {
let request = Request::new(&url, "", "").unwrap();
let matched_rule = engine.check_network_request(&request);
if expected_result {
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
} else {
assert!(!matched_rule.matched, "Expected no match for {}, matched with {:?}", url, matched_rule.filter);
}
Expand All @@ -363,7 +363,7 @@ mod tests {
let request = Request::new(&url, "", "").unwrap();
let matched_rule = engine.check_network_request(&request);
if expected_result {
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
} else {
assert!(!matched_rule.matched, "Expected no match for {}, matched with {:?}", url, matched_rule.filter);
}
Expand Down Expand Up @@ -397,7 +397,7 @@ mod tests {
let request = Request::new(&url, "", "").unwrap();
let matched_rule = deserialized_engine.check_network_request(&request);
if expected_result {
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
} else {
assert!(!matched_rule.matched, "Expected no match for {}, matched with {:?}", url, matched_rule.filter);
}
Expand All @@ -420,7 +420,7 @@ mod tests {
let url = "http://example.com/ad-banner.gif";
let request = Request::new(&url, "", "").unwrap();
let matched_rule = deserialized_engine.check_network_request(&request);
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
}

#[test]
Expand All @@ -440,15 +440,15 @@ mod tests {
let url = "http://example.com/ad-banner.gif";
let request = Request::new(&url, "", "").unwrap();
let matched_rule = deserialized_engine.check_network_request(&request);
assert!(!matched_rule.matched, "Expected NO match for {}", url);
assert!(!matched_rule.matched, "Expected NO match for {url}");

deserialized_engine.enable_tags(&["abc"]);
deserialized_engine.deserialize(&serialized).unwrap();

let url = "http://example.com/ad-banner.gif";
let request = Request::new(&url, "", "").unwrap();
let matched_rule = deserialized_engine.check_network_request(&request);
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
}

#[test]
Expand All @@ -457,7 +457,7 @@ mod tests {
"ad-banner",
], Default::default());
let serialized = engine.serialize_raw().unwrap();
println!("Engine serialized: {:?}", serialized);
println!("Engine serialized: {serialized:?}");
engine.deserialize(&serialized).unwrap();
}

Expand All @@ -468,7 +468,7 @@ mod tests {
], Default::default());
engine.use_tags(&["abc"]);
let serialized = engine.serialize_raw().unwrap();
println!("Engine serialized: {:?}", serialized);
println!("Engine serialized: {serialized:?}");
engine.deserialize(&serialized).unwrap();
}

Expand All @@ -484,7 +484,7 @@ mod tests {
]);

let serialized = engine.serialize_raw().unwrap();
println!("Engine serialized: {:?}", serialized);
println!("Engine serialized: {serialized:?}");
engine.deserialize(&serialized).unwrap();
}

Expand All @@ -511,14 +511,14 @@ mod tests {
let url = "http://example.com/ad-banner.gif";
let request = Request::new(url, "", "").unwrap();
let matched_rule = engine.check_network_request(&request);
assert!(matched_rule.matched, "Expected match for {}", url);
assert!(matched_rule.matched, "Expected match for {url}");
assert_eq!(matched_rule.redirect, Some("data:text/plain;base64,".to_owned()), "Expected redirect to contain resource");

let url = "http://example.com/script.js";
let request = Request::new(url, "", "").unwrap();
let matched_rule = engine.check_network_request(&request);
assert!(matched_rule.matched, "Expected match for {}", url);
assert_eq!(matched_rule.redirect, Some(format!("data:application/javascript;base64,{}", base64::encode(format!("{}", script)))), "Expected redirect to contain resource");
assert!(matched_rule.matched, "Expected match for {url}");
assert_eq!(matched_rule.redirect, Some(format!("data:application/javascript;base64,{}", base64::encode(format!("{script}")))), "Expected redirect to contain resource");
}

#[test]
Expand Down Expand Up @@ -839,7 +839,7 @@ mod tests {
engine.use_resources(resources);

fn wrap_try(scriptlet_content: &str) -> String {
format!("try {{\n{}\n}} catch ( e ) {{ }}\n", scriptlet_content)
format!("try {{\n{scriptlet_content}\n}} catch ( e ) {{ }}\n")
}

assert_eq!(engine.url_cosmetic_resources("https://sub1.example.com").injected_script, wrap_try("refresh-defuser"));
Expand Down
Loading