refactor(dict): Prepare for more dicts

crate-ci · Oct 28, 2019 · 8f428b8 · 8f428b8
1 parent 03fa6f8
commit 8f428b8
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 7 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["codegen", "typos", "typos-dict"]
+members = ["typos", "dict/typos", "dict/typos/codegen"]
 
 [package]
 name = "typos-cli"
@@ -24,7 +24,7 @@ codecov = { repository = "crate-ci/typos" }
 
 [dependencies]
 typos = { version = "0.1", path = "typos" }
-typos-dict = { version = "0.1", path = "typos-dict" }
+typos-dict = { version = "0.1", path = "dict/typos" }
 failure = "0.1"
 structopt = "0.3"
 clap = "2"

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,7 +25,7 @@ stages:
     steps:
     - template: azure/install-rust.yml@templates
     - script: |
-        cargo run --package typos-codegen -- --input typos-dict/assets/words.csv --output typos-dict/src/dict_codegen.rs --check
+        cargo run --package typos-codegen -- --input dict/typos/assets/words.csv --output dict/typos/src/dict_codegen.rs --check
       displayName: Verify Code-gen
 - stage: committed
   displayName: Lint History

diff --git a/typos-dict/Cargo.toml → dict/typos/Cargo.toml b/typos-dict/Cargo.toml → dict/typos/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.1"
 authors = ["Ed Page <[email protected]>"]
 description = "Source Code Spelling Correction"
 repository = "https://github.com/crate-ci/typos"
-readme = "../README.md"
+readme = "../../README.md"
 categories = ["development-tools", "text-processing"]
 keywords = ["development", "spelling"]
 license = "MIT"
@@ -15,7 +15,7 @@ azure-devops = { project = "crate-ci", pipeline = "typos" }
 codecov = { repository = "crate-ci/typos" }
 
 [dependencies]
-typos = { version = "0.1", path = "../typos" }
+typos = { version = "0.1", path = "../../typos" }
 phf = { version = "0.8", features = ["unicase"] }
 unicase = "2.5"
 log = "0.4"
diff --git a/dict/typos/assets/.gitattributes b/dict/typos/assets/.gitattributes
@@ -0,0 +1 @@
+* linguist-vendored
diff --git a/typos-dict/assets/main.go → dict/typos/assets/main.go b/typos-dict/assets/main.go → dict/typos/assets/main.go
diff --git a/typos-dict/assets/words.csv → dict/typos/assets/words.csv b/typos-dict/assets/words.csv → dict/typos/assets/words.csv
diff --git a/typos-dict/assets/words.go → dict/typos/assets/words.go b/typos-dict/assets/words.go → dict/typos/assets/words.go
diff --git a/codegen/Cargo.toml → dict/typos/codegen/Cargo.toml b/codegen/Cargo.toml → dict/typos/codegen/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.1"
 authors = ["Ed Page <[email protected]>"]
 description = "Source Code Spelling Correction"
 repository = "https://github.com/crate-ci/typos"
-readme = "../README.md"
+readme = "../../../README.md"
 categories = ["text-processing"]
 license = "MIT"
 edition = "2018"

diff --git a/codegen/src/main.rs → dict/typos/codegen/src/main.rs b/codegen/src/main.rs → dict/typos/codegen/src/main.rs
diff --git a/typos-dict/src/dict.rs → dict/typos/src/dict.rs b/typos-dict/src/dict.rs → dict/typos/src/dict.rs
diff --git a/typos-dict/src/dict_codegen.rs → dict/typos/src/dict_codegen.rs b/typos-dict/src/dict_codegen.rs → dict/typos/src/dict_codegen.rs
diff --git a/typos-dict/src/lib.rs → dict/typos/src/lib.rs b/typos-dict/src/lib.rs → dict/typos/src/lib.rs