chore: Get rid of common crate, flatten from workspace to single pr…

…oject Closes #13
alexpovel · Aug 27, 2023 · 14fbe3b · 14fbe3b
1 parent 7916ed7
commit 14fbe3b
Show file tree

Hide file tree

Showing 97 changed files with 52 additions and 84 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,48 @@
-[workspace]
+[package]
+name = "betterletters"
+version = "0.1.0"
+edition = "2021"
+authors = ["Alex Povel <rust@alexpovel.de>"]
+description = "Substitute alternative, ASCII-only spellings of special characters with their Unicode equivalents."
+license-file = "LICENSE"
+repository = "https://github.com/alexpovel/betterletters"
+readme = "README.md"
+documentation = "https://docs.rs/betterletters"
+keywords = ["spelling", "umlaut", "substitute", "unicode", "alternative"]
+categories = [
+    "accessibility",
+    "internationalization",
+    "localization",
+    "text-processing",
+    "value-formatting",
+]
 
-members = ["core", "common"]
+[dependencies]
+cached = "0.43.0"
+clap = { version = "4.2.7", features = ["derive"] }
+env_logger = "0.10.0"
+itertools = "0.10.5"
+log = "0.4.17"
+unicode_titlecase = "2.0.0"
+fst = "0.4.7"
+once_cell = "1.18.0"
+decompound = "0.3.0"
+
+[features]
+default = ["all"]
+all = ["de", "symbols"]
+de = []
+symbols = []
+
+[dev-dependencies]
+assert_cmd = "2.0.11"
+criterion = { version = "0.5.1", features = ["html_reports"] }
+insta = { version = "1.29.0", features = ["yaml"] }
+paste = "1.0.12"
+rstest = "0.17.0"
+serde = { version = "1.0.163", features = ["derive"] }
+glob = "0.3.1"
+num_cpus = "1.15.0"
 
 [profile.dev.package.insta]
 # https://insta.rs/docs/quickstart/#optional-faster-runs
@@ -9,3 +51,11 @@ opt-level = 3
 [profile.dev.package.similar]
 # https://insta.rs/docs/quickstart/#optional-faster-runs
 opt-level = 3
+
+[build-dependencies]
+decompound = "0.3.0"
+fst = "0.4.7"
+
+[[bench]]
+name = "threading"
+harness = false
diff --git a/core/benches/mod.rs → benches/mod.rs b/core/benches/mod.rs → benches/mod.rs
diff --git a/core/benches/threading.rs → benches/threading.rs b/core/benches/threading.rs → benches/threading.rs
diff --git a/core/build.rs → build.rs b/core/build.rs → build.rs
diff --git a/common/Cargo.toml b/common/Cargo.toml
diff --git a/common/src/lib.rs b/common/src/lib.rs
diff --git a/core/Cargo.toml b/core/Cargo.toml
diff --git a/core/data/word-lists/de.txt → data/word-lists/de.txt b/core/data/word-lists/de.txt → data/word-lists/de.txt
diff --git a/core/src/lib.rs → src/lib.rs b/core/src/lib.rs → src/lib.rs
diff --git a/core/src/macros.rs → src/macros.rs b/core/src/macros.rs → src/macros.rs
diff --git a/core/src/main.rs → src/main.rs b/core/src/main.rs → src/main.rs
diff --git a/core/src/stages/german/driver.rs → src/stages/german/driver.rs b/core/src/stages/german/driver.rs → src/stages/german/driver.rs
diff --git a/core/src/stages/german/machine.rs → src/stages/german/machine.rs b/core/src/stages/german/machine.rs → src/stages/german/machine.rs
diff --git a/core/src/stages/german/mod.rs → src/stages/german/mod.rs b/core/src/stages/german/mod.rs → src/stages/german/mod.rs
diff --git a/...erman__driver__tests__test_is_valid-.snap → ...erman__driver__tests__test_is_valid-.snap b/...erman__driver__tests__test_is_valid-.snap → ...erman__driver__tests__test_is_valid-.snap
diff --git a/...man__driver__tests__test_is_valid-_0.snap → ...man__driver__tests__test_is_valid-_0.snap b/...man__driver__tests__test_is_valid-_0.snap → ...man__driver__tests__test_is_valid-_0.snap
diff --git a/...driver__tests__test_is_valid-_0Dübel.snap → ...driver__tests__test_is_valid-_0Dübel.snap b/...driver__tests__test_is_valid-_0Dübel.snap → ...driver__tests__test_is_valid-_0Dübel.snap
diff --git a/...iver__tests__test_is_valid-_0Dübel_0.snap → ...iver__tests__test_is_valid-_0Dübel_0.snap b/...iver__tests__test_is_valid-_0Dübel_0.snap → ...iver__tests__test_is_valid-_0Dübel_0.snap
diff --git a/...driver__tests__test_is_valid-_Duebel.snap → ...driver__tests__test_is_valid-_Duebel.snap b/...driver__tests__test_is_valid-_Duebel.snap → ...driver__tests__test_is_valid-_Duebel.snap
diff --git a/..._driver__tests__test_is_valid-_DüBeL.snap → ..._driver__tests__test_is_valid-_DüBeL.snap b/..._driver__tests__test_is_valid-_DüBeL.snap → ..._driver__tests__test_is_valid-_DüBeL.snap
diff --git a/...river__tests__test_is_valid-_Dübel_0.snap → ...river__tests__test_is_valid-_Dübel_0.snap b/...river__tests__test_is_valid-_Dübel_0.snap → ...river__tests__test_is_valid-_Dübel_0.snap
diff --git a/...r__tests__test_is_valid-_Koeffizient.snap → ...r__tests__test_is_valid-_Koeffizient.snap b/...r__tests__test_is_valid-_Koeffizient.snap → ...r__tests__test_is_valid-_Koeffizient.snap
diff --git a/..._driver__tests__test_is_valid-_Kübel.snap → ..._driver__tests__test_is_valid-_Kübel.snap b/..._driver__tests__test_is_valid-_Kübel.snap → ..._driver__tests__test_is_valid-_Kübel.snap
diff --git a/..._driver__tests__test_is_valid-_Mauer.snap → ..._driver__tests__test_is_valid-_Mauer.snap b/..._driver__tests__test_is_valid-_Mauer.snap → ..._driver__tests__test_is_valid-_Mauer.snap
diff --git a/...er__tests__test_is_valid-_Mauerdübel.snap → ...er__tests__test_is_valid-_Mauerdübel.snap b/...er__tests__test_is_valid-_Mauerdübel.snap → ...er__tests__test_is_valid-_Mauerdübel.snap
diff --git a/...ests__test_is_valid-_Mauerdübelkübel.snap → ...ests__test_is_valid-_Mauerdübelkübel.snap b/...ests__test_is_valid-_Mauerdübelkübel.snap → ...ests__test_is_valid-_Mauerdübelkübel.snap
diff --git a/...driver__tests__test_is_valid-_Mauer😂.snap → ...driver__tests__test_is_valid-_Mauer😂.snap b/...driver__tests__test_is_valid-_Mauer😂.snap → ...driver__tests__test_is_valid-_Mauer😂.snap
diff --git a/...__driver__tests__test_is_valid-_Maür.snap → ...__driver__tests__test_is_valid-_Maür.snap b/...__driver__tests__test_is_valid-_Maür.snap → ...__driver__tests__test_is_valid-_Maür.snap
diff --git a/...tests__test_is_valid-_Maürdübelkübel.snap → ...tests__test_is_valid-_Maürdübelkübel.snap b/...tests__test_is_valid-_Maürdübelkübel.snap → ...tests__test_is_valid-_Maürdübelkübel.snap
diff --git a/...river__tests__test_is_valid-_No_nway.snap → ...river__tests__test_is_valid-_No_nway.snap b/...river__tests__test_is_valid-_No_nway.snap → ...river__tests__test_is_valid-_No_nway.snap
diff --git a/...test_is_valid-_Süßwasserschwimmbäder.snap → ...test_is_valid-_Süßwasserschwimmbäder.snap b/...test_is_valid-_Süßwasserschwimmbäder.snap → ...test_is_valid-_Süßwasserschwimmbäder.snap
diff --git a/..._driver__tests__test_is_valid-_dröge.snap → ..._driver__tests__test_is_valid-_dröge.snap b/..._driver__tests__test_is_valid-_dröge.snap → ..._driver__tests__test_is_valid-_dröge.snap
diff --git a/...__tests__test_is_valid-_kindergarten.snap → ...__tests__test_is_valid-_kindergarten.snap b/...__tests__test_is_valid-_kindergarten.snap → ...__tests__test_is_valid-_kindergarten.snap
diff --git a/...ver__tests__test_is_valid-_kongruent.snap → ...ver__tests__test_is_valid-_kongruent.snap b/...ver__tests__test_is_valid-_kongruent.snap → ...ver__tests__test_is_valid-_kongruent.snap
diff --git a/...ver__tests__test_is_valid-_messgerät.snap → ...ver__tests__test_is_valid-_messgerät.snap b/...ver__tests__test_is_valid-_messgerät.snap → ...ver__tests__test_is_valid-_messgerät.snap
diff --git a/..._driver__tests__test_is_valid-_مرحبا.snap → ..._driver__tests__test_is_valid-_مرحبا.snap b/..._driver__tests__test_is_valid-_مرحبا.snap → ..._driver__tests__test_is_valid-_مرحبا.snap
diff --git a/...an__driver__tests__test_is_valid-_你好.snap → ...an__driver__tests__test_is_valid-_你好.snap b/...an__driver__tests__test_is_valid-_你好.snap → ...an__driver__tests__test_is_valid-_你好.snap
diff --git a/...man__driver__tests__test_is_valid-_😎.snap → ...man__driver__tests__test_is_valid-_😎.snap b/...man__driver__tests__test_is_valid-_😎.snap → ...man__driver__tests__test_is_valid-_😎.snap
diff --git a/...driver__tests__test_is_valid-_🤩Dübel.snap → ...driver__tests__test_is_valid-_🤩Dübel.snap b/...driver__tests__test_is_valid-_🤩Dübel.snap → ...driver__tests__test_is_valid-_🤩Dübel.snap
diff --git a/...river__tests__test_is_valid-_🤩Dübel🤐.snap → ...river__tests__test_is_valid-_🤩Dübel🤐.snap b/...river__tests__test_is_valid-_🤩Dübel🤐.snap → ...river__tests__test_is_valid-_🤩Dübel🤐.snap
diff --git a/...iver__tests__test_process-_0Duebel_0.snap → ...iver__tests__test_process-_0Duebel_0.snap b/...iver__tests__test_process-_0Duebel_0.snap → ...iver__tests__test_process-_0Duebel_0.snap
diff --git a/...driver__tests__test_process-_0Kuebel.snap → ...driver__tests__test_process-_0Kuebel.snap b/...driver__tests__test_process-_0Kuebel.snap → ...driver__tests__test_process-_0Kuebel.snap
diff --git a/...__test_process-_Abenteuer_sind_toll!.snap → ...__test_process-_Abenteuer_sind_toll!.snap b/...__test_process-_Abenteuer_sind_toll!.snap → ...__test_process-_Abenteuer_sind_toll!.snap
diff --git a/...__driver__tests__test_process-_Dübel.snap → ...__driver__tests__test_process-_Dübel.snap b/...__driver__tests__test_process-_Dübel.snap → ...__driver__tests__test_process-_Dübel.snap
diff --git a/...ts__test_process-_Ich_mag_AEPFEL!!_😍.snap → ...ts__test_process-_Ich_mag_AEPFEL!!_😍.snap b/...ts__test_process-_Ich_mag_AEPFEL!!_😍.snap → ...ts__test_process-_Ich_mag_AEPFEL!!_😍.snap
diff --git a/...-_Ich_mag_Aepfel,_aber_nicht_Aerger..snap → ...-_Ich_mag_Aepfel,_aber_nicht_Aerger..snap b/...-_Ich_mag_Aepfel,_aber_nicht_Aerger..snap → ...-_Ich_mag_Aepfel,_aber_nicht_Aerger..snap
diff --git a/...er__tests__test_process-_Koeffizient.snap → ...er__tests__test_process-_Koeffizient.snap b/...er__tests__test_process-_Koeffizient.snap → ...er__tests__test_process-_Koeffizient.snap
diff --git a/...t_ein_wichtiger_Bestandteil_von_Oel..snap → ...t_ein_wichtiger_Bestandteil_von_Oel..snap b/...t_ein_wichtiger_Bestandteil_von_Oel..snap → ...t_ein_wichtiger_Bestandteil_von_Oel..snap
diff --git a/..._driver__tests__test_process-_Suess!.snap → ..._driver__tests__test_process-_Suess!.snap b/..._driver__tests__test_process-_Suess!.snap → ..._driver__tests__test_process-_Suess!.snap
diff --git a/...ocess-_WARUM_SCHLIESSEN_WIR_NICHT_AB.snap → ...ocess-_WARUM_SCHLIESSEN_WIR_NICHT_AB.snap b/...ocess-_WARUM_SCHLIESSEN_WIR_NICHT_AB.snap → ...ocess-_WARUM_SCHLIESSEN_WIR_NICHT_AB.snap
diff --git a/...tests__test_process-_Was_sind_aepfel.snap → ...tests__test_process-_Was_sind_aepfel.snap b/...tests__test_process-_Was_sind_aepfel.snap → ...tests__test_process-_Was_sind_aepfel.snap
diff --git a/...ests__test_process-_Wer_mag_Aepfel_!.snap → ...ests__test_process-_Wer_mag_Aepfel_!.snap b/...ests__test_process-_Wer_mag_Aepfel_!.snap → ...ests__test_process-_Wer_mag_Aepfel_!.snap
diff --git a/...ts__test_process-_WiR_sChLieSsEn_ab!.snap → ...ts__test_process-_WiR_sChLieSsEn_ab!.snap b/...ts__test_process-_WiR_sChLieSsEn_ab!.snap → ...ts__test_process-_WiR_sChLieSsEn_ab!.snap
diff --git a/...ocess-_WiR_sChLiesSEn_vieLleEcHt_aB..snap → ...ocess-_WiR_sChLiesSEn_vieLleEcHt_aB..snap b/...ocess-_WiR_sChLiesSEn_vieLleEcHt_aB..snap → ...ocess-_WiR_sChLiesSEn_vieLleEcHt_aB..snap
diff --git a/...st_process-_Wir_schliessen_nicht_ab..snap → ...st_process-_Wir_schliessen_nicht_ab..snap b/...st_process-_Wir_schliessen_nicht_ab..snap → ...st_process-_Wir_schliessen_nicht_ab..snap
diff --git a/...iver__tests__test_process-_kongruent.snap → ...iver__tests__test_process-_kongruent.snap b/...iver__tests__test_process-_kongruent.snap → ...iver__tests__test_process-_kongruent.snap
diff --git a/...driver__tests__test_process-_🤩Duebel.snap → ...driver__tests__test_process-_🤩Duebel.snap b/...driver__tests__test_process-_🤩Duebel.snap → ...driver__tests__test_process-_🤩Duebel.snap
diff --git a/...river__tests__test_process-_🤩Duebel🤐.snap → ...river__tests__test_process-_🤩Duebel🤐.snap b/...river__tests__test_process-_🤩Duebel🤐.snap → ...river__tests__test_process-_🤩Duebel🤐.snap
diff --git a/...tests__test_word_casing_from_string-.snap → ...tests__test_word_casing_from_string-.snap b/...tests__test_word_casing_from_string-.snap → ...tests__test_word_casing_from_string-.snap
diff --git a/...t_word_casing_from_string-_SCREAMING.snap → ...t_word_casing_from_string-_SCREAMING.snap b/...t_word_casing_from_string-_SCREAMING.snap → ...t_word_casing_from_string-_SCREAMING.snap
diff --git a/..._test_word_casing_from_string-_WOW!!.snap → ..._test_word_casing_from_string-_WOW!!.snap b/..._test_word_casing_from_string-_WOW!!.snap → ..._test_word_casing_from_string-_WOW!!.snap
diff --git a/..._test_word_casing_from_string-_bItTe.snap → ..._test_word_casing_from_string-_bItTe.snap b/..._test_word_casing_from_string-_bItTe.snap → ..._test_word_casing_from_string-_bItTe.snap
diff --git a/..._test_word_casing_from_string-_dANKE.snap → ..._test_word_casing_from_string-_dANKE.snap b/..._test_word_casing_from_string-_dANKE.snap → ..._test_word_casing_from_string-_dANKE.snap
diff --git a/..._test_word_casing_from_string-_hello.snap → ..._test_word_casing_from_string-_hello.snap b/..._test_word_casing_from_string-_hello.snap → ..._test_word_casing_from_string-_hello.snap
diff --git a/..._test_word_casing_from_string-_uebel.snap → ..._test_word_casing_from_string-_uebel.snap b/..._test_word_casing_from_string-_uebel.snap → ..._test_word_casing_from_string-_uebel.snap
diff --git a/..._test_word_casing_from_string-_ßuper.snap → ..._test_word_casing_from_string-_ßuper.snap b/..._test_word_casing_from_string-_ßuper.snap → ..._test_word_casing_from_string-_ßuper.snap
diff --git a/...__test_word_casing_from_string-_übel.snap → ...__test_word_casing_from_string-_übel.snap b/...__test_word_casing_from_string-_übel.snap → ...__test_word_casing_from_string-_übel.snap
diff --git a/..._word_casing_from_string-_ẞuperduper.snap → ..._word_casing_from_string-_ẞuperduper.snap b/..._word_casing_from_string-_ẞuperduper.snap → ..._word_casing_from_string-_ẞuperduper.snap
diff --git a/...ts__test_word_casing_from_string-_ẞß.snap → ...ts__test_word_casing_from_string-_ẞß.snap b/...ts__test_word_casing_from_string-_ẞß.snap → ...ts__test_word_casing_from_string-_ẞß.snap
diff --git a/...sts__test_word_casing_from_string-_😀.snap → ...sts__test_word_casing_from_string-_😀.snap b/...sts__test_word_casing_from_string-_😀.snap → ...sts__test_word_casing_from_string-_😀.snap
diff --git a/core/src/stages/german/words.rs → src/stages/german/words.rs b/core/src/stages/german/words.rs → src/stages/german/words.rs
diff --git a/core/src/stages/mod.rs → src/stages/mod.rs b/core/src/stages/mod.rs → src/stages/mod.rs
diff --git a/core/src/stages/symbols/mod.rs → src/stages/symbols/mod.rs b/core/src/stages/symbols/mod.rs → src/stages/symbols/mod.rs
diff --git a/core/src/stages/tooling.rs → src/stages/tooling.rs b/core/src/stages/tooling.rs → src/stages/tooling.rs
diff --git a/core/tests/cli.rs → tests/cli.rs b/core/tests/cli.rs → tests/cli.rs
diff --git a/core/tests/samples/german/001.txt → tests/samples/german/001.txt b/core/tests/samples/german/001.txt → tests/samples/german/001.txt
diff --git a/core/tests/samples/german/002.txt → tests/samples/german/002.txt b/core/tests/samples/german/002.txt → tests/samples/german/002.txt
diff --git a/core/tests/samples/german/003.txt → tests/samples/german/003.txt b/core/tests/samples/german/003.txt → tests/samples/german/003.txt
diff --git a/core/tests/samples/german/004.txt → tests/samples/german/004.txt b/core/tests/samples/german/004.txt → tests/samples/german/004.txt
diff --git a/core/tests/samples/german/005.txt → tests/samples/german/005.txt b/core/tests/samples/german/005.txt → tests/samples/german/005.txt
diff --git a/core/tests/samples/german/006.txt → tests/samples/german/006.txt b/core/tests/samples/german/006.txt → tests/samples/german/006.txt
diff --git a/core/tests/samples/german/007.txt → tests/samples/german/007.txt b/core/tests/samples/german/007.txt → tests/samples/german/007.txt
diff --git a/...pshots/cli__tests__german-001_german.snap → ...pshots/cli__tests__german-001_german.snap b/...pshots/cli__tests__german-001_german.snap → ...pshots/cli__tests__german-001_german.snap
diff --git a/...shots/cli__tests__german-001_symbols.snap → ...shots/cli__tests__german-001_symbols.snap b/...shots/cli__tests__german-001_symbols.snap → ...shots/cli__tests__german-001_symbols.snap
diff --git a/...pshots/cli__tests__german-002_german.snap → ...pshots/cli__tests__german-002_german.snap b/...pshots/cli__tests__german-002_german.snap → ...pshots/cli__tests__german-002_german.snap
diff --git a/...shots/cli__tests__german-002_symbols.snap → ...shots/cli__tests__german-002_symbols.snap b/...shots/cli__tests__german-002_symbols.snap → ...shots/cli__tests__german-002_symbols.snap
diff --git a/...pshots/cli__tests__german-003_german.snap → ...pshots/cli__tests__german-003_german.snap b/...pshots/cli__tests__german-003_german.snap → ...pshots/cli__tests__german-003_german.snap
diff --git a/...shots/cli__tests__german-003_symbols.snap → ...shots/cli__tests__german-003_symbols.snap b/...shots/cli__tests__german-003_symbols.snap → ...shots/cli__tests__german-003_symbols.snap
diff --git a/...pshots/cli__tests__german-004_german.snap → ...pshots/cli__tests__german-004_german.snap b/...pshots/cli__tests__german-004_german.snap → ...pshots/cli__tests__german-004_german.snap
diff --git a/...shots/cli__tests__german-004_symbols.snap → ...shots/cli__tests__german-004_symbols.snap b/...shots/cli__tests__german-004_symbols.snap → ...shots/cli__tests__german-004_symbols.snap
diff --git a/...pshots/cli__tests__german-005_german.snap → ...pshots/cli__tests__german-005_german.snap b/...pshots/cli__tests__german-005_german.snap → ...pshots/cli__tests__german-005_german.snap
diff --git a/...shots/cli__tests__german-005_symbols.snap → ...shots/cli__tests__german-005_symbols.snap b/...shots/cli__tests__german-005_symbols.snap → ...shots/cli__tests__german-005_symbols.snap
diff --git a/...pshots/cli__tests__german-006_german.snap → ...pshots/cli__tests__german-006_german.snap b/...pshots/cli__tests__german-006_german.snap → ...pshots/cli__tests__german-006_german.snap
diff --git a/...shots/cli__tests__german-006_symbols.snap → ...shots/cli__tests__german-006_symbols.snap b/...shots/cli__tests__german-006_symbols.snap → ...shots/cli__tests__german-006_symbols.snap
diff --git a/...pshots/cli__tests__german-007_german.snap → ...pshots/cli__tests__german-007_german.snap b/...pshots/cli__tests__german-007_german.snap → ...pshots/cli__tests__german-007_german.snap
diff --git a/...shots/cli__tests__german-007_symbols.snap → ...shots/cli__tests__german-007_symbols.snap b/...shots/cli__tests__german-007_symbols.snap → ...shots/cli__tests__german-007_symbols.snap