Rust fmt after rebase.

brave · Jan 29, 2025 · 880d83c · 880d83c
1 parent bc8d2e3
commit 880d83c
Show file tree

Hide file tree

Showing 4 changed files with 709 additions and 554 deletions.
diff --git a/benches/bench_matching.rs b/benches/bench_matching.rs
@@ -82,10 +82,7 @@ fn bench_matching_only(
 
 type ParsedRequest = (String, String, String, String, bool);
 
-fn bench_rule_matching_browserlike(
-    blocker: &Engine,
-    requests: &Vec<ParsedRequest>,
-) -> (u32, u32) {
+fn bench_rule_matching_browserlike(blocker: &Engine, requests: &Vec<ParsedRequest>) -> (u32, u32) {
     let mut matches = 0;
     let mut passes = 0;
     requests.iter().for_each(
@@ -350,10 +347,10 @@ fn rule_match_browserlike_comparable(c: &mut Criterion) {
         b.iter(|| bench_rule_matching_browserlike(&engine, &requests))
     });
     group.bench_function("brave-list", |b| {
-      let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
-      let engine = Engine::from_rules_parametrised(rules, Default::default(), false, true);
-      b.iter(|| bench_rule_matching_browserlike(&engine, &requests))
-  });
+        let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
+        let engine = Engine::from_rules_parametrised(rules, Default::default(), false, true);
+        b.iter(|| bench_rule_matching_browserlike(&engine, &requests))
+    });
 
     group.finish();
 }
@@ -372,21 +369,20 @@ fn rule_match_first_request(c: &mut Criterion) {
     )];
 
     group.bench_function("brave-list", |b| {
-        b.iter_custom(
-            |iters| {
-                let mut total_time = std::time::Duration::ZERO;
-                for _ in 0..iters {
-                  let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
-                  let engine = Engine::from_rules_parametrised(rules, Default::default(), false, true);
-
-                  // Measure only the matching time, skip setup and destruction
-                  let start_time = std::time::Instant::now();
-                  bench_rule_matching_browserlike(&engine, &requests);
-                  total_time += start_time.elapsed();
-                }
-                total_time
+        b.iter_custom(|iters| {
+            let mut total_time = std::time::Duration::ZERO;
+            for _ in 0..iters {
+                let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
+                let engine =
+                    Engine::from_rules_parametrised(rules, Default::default(), false, true);
+
+                // Measure only the matching time, skip setup and destruction
+                let start_time = std::time::Instant::now();
+                bench_rule_matching_browserlike(&engine, &requests);
+                total_time += start_time.elapsed();
             }
-        )
+            total_time
+        })
     });
 
     group.finish();

diff --git a/benches/bench_memory.rs b/benches/bench_memory.rs
@@ -4,12 +4,12 @@
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use criterion::*;
+use serde::{Deserialize, Serialize};
 use std::alloc::{GlobalAlloc, Layout, System};
 use std::sync::atomic::{AtomicUsize, Ordering};
-use serde::{Deserialize, Serialize};
 
-use adblock::Engine;
 use adblock::request::Request;
+use adblock::Engine;
 
 #[path = "../tests/test_utils.rs"]
 mod test_utils;
@@ -110,15 +110,15 @@ fn bench_memory_usage(c: &mut Criterion) {
         let mut result = 0;
         b.iter_custom(|iters| {
             for _ in 0..iters {
-              ALLOCATOR.reset();
-              let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
-              let engine = Engine::from_rules(rules, Default::default());
+                ALLOCATOR.reset();
+                let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
+                let engine = Engine::from_rules(rules, Default::default());
 
-              noise += 1; // add some noise to make criterion happy
-              result += ALLOCATOR.current_usage() + noise;
+                noise += 1; // add some noise to make criterion happy
+                result += ALLOCATOR.current_usage() + noise;
 
-              // Prevent engine from being optimized
-              criterion::black_box(&engine);
+                // Prevent engine from being optimized
+                criterion::black_box(&engine);
             }
 
             // Return the memory usage as a Duration
@@ -134,15 +134,15 @@ fn bench_memory_usage(c: &mut Criterion) {
                 let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
                 let engine = Engine::from_rules(rules, Default::default());
 
-              for request in first_1000_requests.clone() {
-                  criterion::black_box(engine.check_network_request(&request.into()));
-              }
+                for request in first_1000_requests.clone() {
+                    criterion::black_box(engine.check_network_request(&request.into()));
+                }
 
-              noise += 1; // add some noise to make criterion happy
-              result += ALLOCATOR.current_usage() + noise;
+                noise += 1; // add some noise to make criterion happy
+                result += ALLOCATOR.current_usage() + noise;
 
-              // Prevent engine from being optimized
-              criterion::black_box(&engine);
+                // Prevent engine from being optimized
+                criterion::black_box(&engine);
             }
 
             // Return the memory usage as a Duration

diff --git a/benches/bench_rules.rs b/benches/bench_rules.rs
@@ -99,13 +99,12 @@ fn blocker_new(c: &mut Criterion) {
         "data/easylist.to/easylist/easyprivacy.txt",
     ])
     .collect();
-    let brave_list_rules: Vec<_> = rules_from_lists(&[
-        "data/brave/brave-main-list.txt",
-    ])
-    .collect();
+    let brave_list_rules: Vec<_> = rules_from_lists(&["data/brave/brave-main-list.txt"]).collect();
 
     group.bench_function("el+ep", move |b| b.iter(|| get_blocker(&easylist_rules)));
-    group.bench_function("brave-list", move |b| b.iter(|| get_blocker(&brave_list_rules)));
+    group.bench_function("brave-list", move |b| {
+        b.iter(|| get_blocker(&brave_list_rules))
+    });
 
     group.finish();
 }