From 814ff82affb1f30434aeb8a28e548811c7e6ee7e Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 18 May 2020 19:58:38 -0500 Subject: [PATCH] refactor: Follow monorepo pattern elsewhere --- Cargo.toml | 14 +++++++------- azure-pipelines.yml | 8 ++++---- benches/data.rs | 2 +- .../codespell => crates/codespell-dict}/Cargo.toml | 0 .../codespell => crates/codespell-dict}/README.md | 0 .../codespell-dict}/assets/dictionary.txt | 0 .../codespell-dict}/codegen/Cargo.toml | 0 .../codespell-dict}/codegen/src/main.rs | 0 .../codespell-dict}/src/dict_codegen.rs | 0 .../codespell => crates/codespell-dict}/src/lib.rs | 0 {dict/misspell => crates/misspell-dict}/Cargo.toml | 0 {dict/misspell => crates/misspell-dict}/README.md | 0 .../misspell-dict}/assets/.gitattributes | 0 .../misspell-dict}/assets/words.go | 0 .../misspell-dict}/codegen/Cargo.toml | 0 .../misspell-dict}/codegen/src/main.rs | 0 .../misspell-dict}/src/dict_codegen.rs | 0 {dict/misspell => crates/misspell-dict}/src/lib.rs | 0 {dict/typos => crates/typos-dict}/Cargo.toml | 0 .../typos-dict}/assets/.gitattributes | 0 {dict/typos => crates/typos-dict}/assets/words.csv | 0 .../typos => crates/typos-dict}/codegen/Cargo.toml | 0 .../typos-dict}/codegen/src/main.rs | 0 .../typos-dict}/src/dict_codegen.rs | 0 {dict/typos => crates/typos-dict}/src/lib.rs | 0 {typos => crates/typos}/Cargo.toml | 0 {typos => crates/typos}/src/checks.rs | 0 {typos => crates/typos}/src/dict.rs | 0 {typos => crates/typos}/src/error.rs | 0 {typos => crates/typos}/src/lib.rs | 0 {typos => crates/typos}/src/report.rs | 0 {typos => crates/typos}/src/tokens.rs | 0 .../wikipedia => crates/wikipedia-dict}/Cargo.toml | 0 .../wikipedia => crates/wikipedia-dict}/README.md | 0 .../wikipedia-dict}/assets/dictionary.txt | 0 .../wikipedia-dict}/codegen/Cargo.toml | 0 .../wikipedia-dict}/codegen/src/main.rs | 0 .../wikipedia-dict}/src/dict_codegen.rs | 0 .../wikipedia => crates/wikipedia-dict}/src/lib.rs | 0 39 files changed, 12 insertions(+), 12 deletions(-) rename {dict/codespell => crates/codespell-dict}/Cargo.toml (100%) rename {dict/codespell => crates/codespell-dict}/README.md (100%) rename {dict/codespell => crates/codespell-dict}/assets/dictionary.txt (100%) rename {dict/codespell => crates/codespell-dict}/codegen/Cargo.toml (100%) rename {dict/codespell => crates/codespell-dict}/codegen/src/main.rs (100%) rename {dict/codespell => crates/codespell-dict}/src/dict_codegen.rs (100%) rename {dict/codespell => crates/codespell-dict}/src/lib.rs (100%) rename {dict/misspell => crates/misspell-dict}/Cargo.toml (100%) rename {dict/misspell => crates/misspell-dict}/README.md (100%) rename {dict/misspell => crates/misspell-dict}/assets/.gitattributes (100%) rename {dict/misspell => crates/misspell-dict}/assets/words.go (100%) rename {dict/misspell => crates/misspell-dict}/codegen/Cargo.toml (100%) rename {dict/misspell => crates/misspell-dict}/codegen/src/main.rs (100%) rename {dict/misspell => crates/misspell-dict}/src/dict_codegen.rs (100%) rename {dict/misspell => crates/misspell-dict}/src/lib.rs (100%) rename {dict/typos => crates/typos-dict}/Cargo.toml (100%) rename {dict/typos => crates/typos-dict}/assets/.gitattributes (100%) rename {dict/typos => crates/typos-dict}/assets/words.csv (100%) rename {dict/typos => crates/typos-dict}/codegen/Cargo.toml (100%) rename {dict/typos => crates/typos-dict}/codegen/src/main.rs (100%) rename {dict/typos => crates/typos-dict}/src/dict_codegen.rs (100%) rename {dict/typos => crates/typos-dict}/src/lib.rs (100%) rename {typos => crates/typos}/Cargo.toml (100%) rename {typos => crates/typos}/src/checks.rs (100%) rename {typos => crates/typos}/src/dict.rs (100%) rename {typos => crates/typos}/src/error.rs (100%) rename {typos => crates/typos}/src/lib.rs (100%) rename {typos => crates/typos}/src/report.rs (100%) rename {typos => crates/typos}/src/tokens.rs (100%) rename {dict/wikipedia => crates/wikipedia-dict}/Cargo.toml (100%) rename {dict/wikipedia => crates/wikipedia-dict}/README.md (100%) rename {dict/wikipedia => crates/wikipedia-dict}/assets/dictionary.txt (100%) rename {dict/wikipedia => crates/wikipedia-dict}/codegen/Cargo.toml (100%) rename {dict/wikipedia => crates/wikipedia-dict}/codegen/src/main.rs (100%) rename {dict/wikipedia => crates/wikipedia-dict}/src/dict_codegen.rs (100%) rename {dict/wikipedia => crates/wikipedia-dict}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 81612c5..3200481 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [workspace] members = [ - "typos", - "dict/typos", "dict/typos/codegen", - "dict/codespell", "dict/codespell/codegen", - "dict/misspell", "dict/misspell/codegen", - "dict/wikipedia", "dict/wikipedia/codegen", + "crates/typos", + "crates/typos-dict", "crates/typos-dict/codegen", + "crates/codespell-dict", "crates/codespell-dict/codegen", + "crates/misspell-dict", "crates/misspell-dict/codegen", + "crates/wikipedia-dict", "crates/wikipedia-dict/codegen", ] [package] @@ -29,8 +29,8 @@ azure-devops = { project = "crate-ci", pipeline = "typos" } codecov = { repository = "crate-ci/typos" } [dependencies] -typos = { version = "^0.3", path = "typos" } -typos-dict = { version = "^0.2", path = "dict/typos" } +typos = { version = "^0.3", path = "crates/typos" } +typos-dict = { version = "^0.2", path = "crates/typos-dict" } phf = { version = "0.8", features = ["unicase"] } unicase = "2.5" anyhow = "1.0" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b17fd90..2db5146 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,16 +28,16 @@ stages: steps: - template: install-rust.yml@templates - script: | - cargo run --package typos-codegen -- --output dict/typos/src/dict_codegen.rs --check + cargo run --package typos-codegen -- --output crates/typos-dict/src/dict_codegen.rs --check displayName: Verify typos-dict - script: | - cargo run --package codespell-codegen -- --output dict/codespell/src/dict_codegen.rs --check + cargo run --package codespell-codegen -- --output crates/codespell-dict/src/dict_codegen.rs --check displayName: Verify codespell-dict - script: | - cargo run --package misspell-codegen -- --output dict/misspell/src/dict_codegen.rs --check + cargo run --package misspell-codegen -- --output crates/misspell-dict/src/dict_codegen.rs --check displayName: Verify misspell-dict - script: | - cargo run --package wikipedia-codegen -- --output dict/wikipedia/src/dict_codegen.rs --check + cargo run --package wikipedia-codegen -- --output crates/wikipedia-dict/src/dict_codegen.rs --check displayName: Verify wikipedia-dict - stage: committed displayName: Lint History diff --git a/benches/data.rs b/benches/data.rs index 4c67ead..be89d07 100644 --- a/benches/data.rs +++ b/benches/data.rs @@ -28,4 +28,4 @@ fn main() { } "; -pub const CORPUS: &str = include_str!("../dict/typos/assets/words.csv"); +pub const CORPUS: &str = include_str!("../crates/typos-dict/assets/words.csv"); diff --git a/dict/codespell/Cargo.toml b/crates/codespell-dict/Cargo.toml similarity index 100% rename from dict/codespell/Cargo.toml rename to crates/codespell-dict/Cargo.toml diff --git a/dict/codespell/README.md b/crates/codespell-dict/README.md similarity index 100% rename from dict/codespell/README.md rename to crates/codespell-dict/README.md diff --git a/dict/codespell/assets/dictionary.txt b/crates/codespell-dict/assets/dictionary.txt similarity index 100% rename from dict/codespell/assets/dictionary.txt rename to crates/codespell-dict/assets/dictionary.txt diff --git a/dict/codespell/codegen/Cargo.toml b/crates/codespell-dict/codegen/Cargo.toml similarity index 100% rename from dict/codespell/codegen/Cargo.toml rename to crates/codespell-dict/codegen/Cargo.toml diff --git a/dict/codespell/codegen/src/main.rs b/crates/codespell-dict/codegen/src/main.rs similarity index 100% rename from dict/codespell/codegen/src/main.rs rename to crates/codespell-dict/codegen/src/main.rs diff --git a/dict/codespell/src/dict_codegen.rs b/crates/codespell-dict/src/dict_codegen.rs similarity index 100% rename from dict/codespell/src/dict_codegen.rs rename to crates/codespell-dict/src/dict_codegen.rs diff --git a/dict/codespell/src/lib.rs b/crates/codespell-dict/src/lib.rs similarity index 100% rename from dict/codespell/src/lib.rs rename to crates/codespell-dict/src/lib.rs diff --git a/dict/misspell/Cargo.toml b/crates/misspell-dict/Cargo.toml similarity index 100% rename from dict/misspell/Cargo.toml rename to crates/misspell-dict/Cargo.toml diff --git a/dict/misspell/README.md b/crates/misspell-dict/README.md similarity index 100% rename from dict/misspell/README.md rename to crates/misspell-dict/README.md diff --git a/dict/misspell/assets/.gitattributes b/crates/misspell-dict/assets/.gitattributes similarity index 100% rename from dict/misspell/assets/.gitattributes rename to crates/misspell-dict/assets/.gitattributes diff --git a/dict/misspell/assets/words.go b/crates/misspell-dict/assets/words.go similarity index 100% rename from dict/misspell/assets/words.go rename to crates/misspell-dict/assets/words.go diff --git a/dict/misspell/codegen/Cargo.toml b/crates/misspell-dict/codegen/Cargo.toml similarity index 100% rename from dict/misspell/codegen/Cargo.toml rename to crates/misspell-dict/codegen/Cargo.toml diff --git a/dict/misspell/codegen/src/main.rs b/crates/misspell-dict/codegen/src/main.rs similarity index 100% rename from dict/misspell/codegen/src/main.rs rename to crates/misspell-dict/codegen/src/main.rs diff --git a/dict/misspell/src/dict_codegen.rs b/crates/misspell-dict/src/dict_codegen.rs similarity index 100% rename from dict/misspell/src/dict_codegen.rs rename to crates/misspell-dict/src/dict_codegen.rs diff --git a/dict/misspell/src/lib.rs b/crates/misspell-dict/src/lib.rs similarity index 100% rename from dict/misspell/src/lib.rs rename to crates/misspell-dict/src/lib.rs diff --git a/dict/typos/Cargo.toml b/crates/typos-dict/Cargo.toml similarity index 100% rename from dict/typos/Cargo.toml rename to crates/typos-dict/Cargo.toml diff --git a/dict/typos/assets/.gitattributes b/crates/typos-dict/assets/.gitattributes similarity index 100% rename from dict/typos/assets/.gitattributes rename to crates/typos-dict/assets/.gitattributes diff --git a/dict/typos/assets/words.csv b/crates/typos-dict/assets/words.csv similarity index 100% rename from dict/typos/assets/words.csv rename to crates/typos-dict/assets/words.csv diff --git a/dict/typos/codegen/Cargo.toml b/crates/typos-dict/codegen/Cargo.toml similarity index 100% rename from dict/typos/codegen/Cargo.toml rename to crates/typos-dict/codegen/Cargo.toml diff --git a/dict/typos/codegen/src/main.rs b/crates/typos-dict/codegen/src/main.rs similarity index 100% rename from dict/typos/codegen/src/main.rs rename to crates/typos-dict/codegen/src/main.rs diff --git a/dict/typos/src/dict_codegen.rs b/crates/typos-dict/src/dict_codegen.rs similarity index 100% rename from dict/typos/src/dict_codegen.rs rename to crates/typos-dict/src/dict_codegen.rs diff --git a/dict/typos/src/lib.rs b/crates/typos-dict/src/lib.rs similarity index 100% rename from dict/typos/src/lib.rs rename to crates/typos-dict/src/lib.rs diff --git a/typos/Cargo.toml b/crates/typos/Cargo.toml similarity index 100% rename from typos/Cargo.toml rename to crates/typos/Cargo.toml diff --git a/typos/src/checks.rs b/crates/typos/src/checks.rs similarity index 100% rename from typos/src/checks.rs rename to crates/typos/src/checks.rs diff --git a/typos/src/dict.rs b/crates/typos/src/dict.rs similarity index 100% rename from typos/src/dict.rs rename to crates/typos/src/dict.rs diff --git a/typos/src/error.rs b/crates/typos/src/error.rs similarity index 100% rename from typos/src/error.rs rename to crates/typos/src/error.rs diff --git a/typos/src/lib.rs b/crates/typos/src/lib.rs similarity index 100% rename from typos/src/lib.rs rename to crates/typos/src/lib.rs diff --git a/typos/src/report.rs b/crates/typos/src/report.rs similarity index 100% rename from typos/src/report.rs rename to crates/typos/src/report.rs diff --git a/typos/src/tokens.rs b/crates/typos/src/tokens.rs similarity index 100% rename from typos/src/tokens.rs rename to crates/typos/src/tokens.rs diff --git a/dict/wikipedia/Cargo.toml b/crates/wikipedia-dict/Cargo.toml similarity index 100% rename from dict/wikipedia/Cargo.toml rename to crates/wikipedia-dict/Cargo.toml diff --git a/dict/wikipedia/README.md b/crates/wikipedia-dict/README.md similarity index 100% rename from dict/wikipedia/README.md rename to crates/wikipedia-dict/README.md diff --git a/dict/wikipedia/assets/dictionary.txt b/crates/wikipedia-dict/assets/dictionary.txt similarity index 100% rename from dict/wikipedia/assets/dictionary.txt rename to crates/wikipedia-dict/assets/dictionary.txt diff --git a/dict/wikipedia/codegen/Cargo.toml b/crates/wikipedia-dict/codegen/Cargo.toml similarity index 100% rename from dict/wikipedia/codegen/Cargo.toml rename to crates/wikipedia-dict/codegen/Cargo.toml diff --git a/dict/wikipedia/codegen/src/main.rs b/crates/wikipedia-dict/codegen/src/main.rs similarity index 100% rename from dict/wikipedia/codegen/src/main.rs rename to crates/wikipedia-dict/codegen/src/main.rs diff --git a/dict/wikipedia/src/dict_codegen.rs b/crates/wikipedia-dict/src/dict_codegen.rs similarity index 100% rename from dict/wikipedia/src/dict_codegen.rs rename to crates/wikipedia-dict/src/dict_codegen.rs diff --git a/dict/wikipedia/src/lib.rs b/crates/wikipedia-dict/src/lib.rs similarity index 100% rename from dict/wikipedia/src/lib.rs rename to crates/wikipedia-dict/src/lib.rs