refactor(cli): Break out config->policy

This is prep for having many policies floating around
crate-ci · Mar 30, 2021 · 8bcacf3 · 8bcacf3
1 parent b17f9c3
commit 8bcacf3
Show file tree

Hide file tree

Showing 7 changed files with 187 additions and 160 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,6 +46,7 @@ toml = "0.5"
 log = "0.4"
 env_logger = "0.8"
 bstr = "0.2"
+once_cell = "1.2.0"
 ahash = "0.7"
 difflib = "0.4"
 proc-exit = "1.0"
@@ -58,6 +59,7 @@ itertools = "0.10"
 serde_json = "1.0"
 encoding = "0.2"
 kstring = "1.0"
+typed-arena = "2.0.1"
 
 [dev-dependencies]
 assert_fs = "1.0"

diff --git a/benches/checks.rs b/benches/checks.rs
@@ -5,6 +5,12 @@ use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use typos_cli::file::FileChecker;
 
 fn bench_checks(c: &mut Criterion) {
+    let dictionary = typos_cli::dict::BuiltIn::new(Default::default());
+    let tokenizer = typos::tokens::Tokenizer::new();
+    let policy = typos_cli::policy::Policy::new()
+        .dictionary(&dictionary)
+        .tokenizer(&tokenizer);
+
     let mut group = c.benchmark_group("checks");
     for (name, sample) in data::DATA {
         let len = sample.len();
@@ -13,16 +19,11 @@ fn bench_checks(c: &mut Criterion) {
             let sample_path = temp.child("sample");
             sample_path.write_str(sample).unwrap();
 
-            let corrections = typos_cli::dict::BuiltIn::new(Default::default());
-            let parser = typos::tokens::Tokenizer::new();
-            let settings = typos_cli::file::CheckSettings::new();
             b.iter(|| {
                 typos_cli::file::FoundFiles.check_file(
                     sample_path.path(),
                     true,
-                    &settings,
-                    &parser,
-                    &corrections,
+                    &policy,
                     &typos_cli::report::PrintSilent,
                 )
             });
@@ -34,16 +35,11 @@ fn bench_checks(c: &mut Criterion) {
             let sample_path = temp.child("sample");
             sample_path.write_str(sample).unwrap();
 
-            let corrections = typos_cli::dict::BuiltIn::new(Default::default());
-            let parser = typos::tokens::Tokenizer::new();
-            let settings = typos_cli::file::CheckSettings::new();
             b.iter(|| {
                 typos_cli::file::Identifiers.check_file(
                     sample_path.path(),
                     true,
-                    &settings,
-                    &parser,
-                    &corrections,
+                    &policy,
                     &typos_cli::report::PrintSilent,
                 )
             });
@@ -55,16 +51,11 @@ fn bench_checks(c: &mut Criterion) {
             let sample_path = temp.child("sample");
             sample_path.write_str(sample).unwrap();
 
-            let corrections = typos_cli::dict::BuiltIn::new(Default::default());
-            let parser = typos::tokens::Tokenizer::new();
-            let settings = typos_cli::file::CheckSettings::new();
             b.iter(|| {
                 typos_cli::file::Words.check_file(
                     sample_path.path(),
                     true,
-                    &settings,
-                    &parser,
-                    &corrections,
+                    &policy,
                     &typos_cli::report::PrintSilent,
                 )
             });
@@ -76,16 +67,11 @@ fn bench_checks(c: &mut Criterion) {
             let sample_path = temp.child("sample");
             sample_path.write_str(sample).unwrap();
 
-            let corrections = typos_cli::dict::BuiltIn::new(Default::default());
-            let parser = typos::tokens::Tokenizer::new();
-            let settings = typos_cli::file::CheckSettings::new();
             b.iter(|| {
                 typos_cli::file::Typos.check_file(
                     sample_path.path(),
                     true,
-                    &settings,
-                    &parser,
-                    &corrections,
+                    &policy,
                     &typos_cli::report::PrintSilent,
                 )
             });