generalize list-of-string APIs

brave · Jul 26, 2023 · b028c77 · b028c77
1 parent 83d0df0
commit b028c77
Show file tree

Hide file tree

Showing 13 changed files with 397 additions and 409 deletions.
diff --git a/benches/bench_matching.rs b/benches/bench_matching.rs
@@ -129,9 +129,9 @@ fn rule_match(c: &mut Criterion) {
 fn rule_match_parsed_el(c: &mut Criterion) {
     let mut group = c.benchmark_group("rule-match-parsed");
 
-    let rules = rules_from_lists(&vec![String::from(
+    let rules = rules_from_lists(&[
         "data/easylist.to/easylist/easylist.txt",
-    )]);
+    ]);
     let requests = load_requests();
     let requests_parsed: Vec<_> = requests
         .into_iter()
@@ -154,9 +154,9 @@ fn rule_match_parsed_el(c: &mut Criterion) {
 fn rule_match_parsed_elep_slimlist(c: &mut Criterion) {
     let mut group = c.benchmark_group("rule-match-parsed");
 
-    let full_rules = rules_from_lists(&vec![
-        String::from("data/easylist.to/easylist/easylist.txt"),
-        String::from("data/easylist.to/easylist/easyprivacy.txt"),
+    let full_rules = rules_from_lists(&[
+        "data/easylist.to/easylist/easylist.txt",
+        "data/easylist.to/easylist/easyprivacy.txt",
     ]);
     let blocker = get_blocker(&full_rules);
 
@@ -168,7 +168,7 @@ fn rule_match_parsed_elep_slimlist(c: &mut Criterion) {
         .collect();
     let requests_len = requests_parsed.len() as u64;
 
-    let slim_rules = rules_from_lists(&vec![String::from("data/slim-list.txt")]);
+    let slim_rules = rules_from_lists(&["data/slim-list.txt"]);
     let slim_blocker = get_blocker(&slim_rules);
 
     let requests_copy = load_requests();
@@ -197,24 +197,24 @@ fn serialization(c: &mut Criterion) {
     group.sample_size(20);
 
     group.bench_function("el+ep", move |b| {
-        let full_rules = rules_from_lists(&vec![
-            String::from("data/easylist.to/easylist/easylist.txt"),
-            String::from("data/easylist.to/easylist/easyprivacy.txt"),
+        let full_rules = rules_from_lists(&[
+            "data/easylist.to/easylist/easylist.txt",
+            "data/easylist.to/easylist/easyprivacy.txt",
         ]);
 
         let engine = Engine::from_rules(&full_rules, Default::default());
         b.iter(|| assert!(engine.serialize_raw().unwrap().len() > 0))
     });
     group.bench_function("el", move |b| {
-        let full_rules = rules_from_lists(&vec![String::from(
+        let full_rules = rules_from_lists(&[
             "data/easylist.to/easylist/easylist.txt",
-        )]);
+        ]);
 
         let engine = Engine::from_rules(&full_rules, Default::default());
         b.iter(|| assert!(engine.serialize_raw().unwrap().len() > 0))
     });
     group.bench_function("slimlist", move |b| {
-        let full_rules = rules_from_lists(&vec![String::from("data/slim-list.txt")]);
+        let full_rules = rules_from_lists(&["data/slim-list.txt"]);
 
         let engine = Engine::from_rules(&full_rules, Default::default());
         b.iter(|| assert!(engine.serialize_raw().unwrap().len() > 0))
@@ -229,9 +229,9 @@ fn deserialization(c: &mut Criterion) {
     group.sample_size(20);
 
     group.bench_function("el+ep", move |b| {
-        let full_rules = rules_from_lists(&vec![
-            String::from("data/easylist.to/easylist/easylist.txt"),
-            String::from("data/easylist.to/easylist/easyprivacy.txt"),
+        let full_rules = rules_from_lists(&[
+            "data/easylist.to/easylist/easylist.txt",
+            "data/easylist.to/easylist/easyprivacy.txt",
         ]);
 
         let engine = Engine::from_rules(&full_rules, Default::default());
@@ -243,9 +243,9 @@ fn deserialization(c: &mut Criterion) {
         })
     });
     group.bench_function("el", move |b| {
-        let full_rules = rules_from_lists(&vec![String::from(
+        let full_rules = rules_from_lists(&[
             "data/easylist.to/easylist/easylist.txt",
-        )]);
+        ]);
 
         let engine = Engine::from_rules(&full_rules, Default::default());
         let serialized = engine.serialize_raw().unwrap();
@@ -256,7 +256,7 @@ fn deserialization(c: &mut Criterion) {
         })
     });
     group.bench_function("slimlist", move |b| {
-        let full_rules = rules_from_lists(&vec![String::from("data/slim-list.txt")]);
+        let full_rules = rules_from_lists(&["data/slim-list.txt"]);
 
         let engine = Engine::from_rules(&full_rules, Default::default());
         let serialized = engine.serialize_raw().unwrap();

diff --git a/benches/bench_rules.rs b/benches/bench_rules.rs
@@ -5,9 +5,9 @@ use adblock::blocker::{Blocker, BlockerOptions};
 use adblock::utils::{read_file_lines, rules_from_lists};
 
 static DEFAULT_LISTS: Lazy<Vec<String>> = Lazy::new(|| {
-    rules_from_lists(&vec![String::from(
+    rules_from_lists(&[
         "data/easylist.to/easylist/easylist.txt",
-    )])
+    ])
 });
 static DEFAULT_RULES_LISTS: Lazy<Vec<Vec<String>>> =
     Lazy::new(|| vec![read_file_lines("data/easylist.to/easylist/easylist.txt")]);
@@ -98,9 +98,9 @@ fn blocker_new(c: &mut Criterion) {
     group.throughput(Throughput::Elements(1));
     group.sample_size(10);
 
-    let rules = rules_from_lists(&vec![
-        String::from("data/easylist.to/easylist/easylist.txt"),
-        String::from("data/easylist.to/easylist/easyprivacy.txt"),
+    let rules = rules_from_lists(&[
+        "data/easylist.to/easylist/easylist.txt",
+        "data/easylist.to/easylist/easyprivacy.txt",
     ]);
 
     group.bench_function("el+ep", move |b| b.iter(|| get_blocker(&rules)));