From 385dcca53caaeeddce4c42321d83ad22ce0743e2 Mon Sep 17 00:00:00 2001 From: Eric Scouten Date: Sun, 5 Jan 2025 11:09:59 -0800 Subject: [PATCH 1/4] chore: Rearrange project as a workspace --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 2 +- Cargo.toml | 49 ++----------------- parser/Cargo.toml | 45 +++++++++++++++++ {src => parser/src}/attributes/attrlist.rs | 0 .../src}/attributes/element_attribute.rs | 0 {src => parser/src}/attributes/mod.rs | 0 {src => parser/src}/blocks/block.rs | 0 .../src}/blocks/compound_delimited.rs | 0 {src => parser/src}/blocks/is_block.rs | 0 {src => parser/src}/blocks/macro.rs | 0 {src => parser/src}/blocks/mod.rs | 0 {src => parser/src}/blocks/parse_utils.rs | 0 {src => parser/src}/blocks/preamble.rs | 0 {src => parser/src}/blocks/raw_delimited.rs | 0 {src => parser/src}/blocks/section.rs | 0 {src => parser/src}/blocks/simple.rs | 0 {src => parser/src}/document/attribute.rs | 0 {src => parser/src}/document/document.rs | 0 {src => parser/src}/document/header.rs | 0 {src => parser/src}/document/mod.rs | 0 {src => parser/src}/inlines/inline.rs | 0 {src => parser/src}/inlines/macro.rs | 0 {src => parser/src}/inlines/mod.rs | 0 {src => parser/src}/lib.rs | 0 {src => parser/src}/span/discard.rs | 0 {src => parser/src}/span/line.rs | 0 {src => parser/src}/span/matched_item.rs | 0 {src => parser/src}/span/mod.rs | 0 {src => parser/src}/span/primitives.rs | 0 {src => parser/src}/span/slice.rs | 0 {src => parser/src}/span/split.rs | 0 {src => parser/src}/span/take.rs | 0 {src => parser/src}/span/trim.rs | 0 {src => parser/src}/strings.rs | 0 .../attributes/element_attributes.rs | 0 .../tests/asciidoc_lang/attributes/mod.rs | 0 .../positional_and_named_attributes.rs | 0 .../tests/asciidoc_lang/blocks/add_title.rs | 0 .../tests/asciidoc_lang/blocks/delimited.rs | 0 .../src}/tests/asciidoc_lang/blocks/index.rs | 0 .../src}/tests/asciidoc_lang/blocks/mod.rs | 0 .../src}/tests/asciidoc_lang/mod.rs | 0 .../root/asciidoc_vs_markdown.rs | 0 .../asciidoc_lang/root/document_processing.rs | 0 .../asciidoc_lang/root/document_structure.rs | 0 .../src}/tests/asciidoc_lang/root/index.rs | 0 .../tests/asciidoc_lang/root/key_concepts.rs | 0 .../src}/tests/asciidoc_lang/root/mod.rs | 0 .../tests/asciidoc_lang/root/normalization.rs | 0 .../src}/tests/attributes/attrlist.rs | 0 .../tests/attributes/element_attribute.rs | 0 {src => parser/src}/tests/attributes/mod.rs | 0 .../tests/blocks/block/compound_delimited.rs | 0 .../src}/tests/blocks/block/macro.rs | 0 {src => parser/src}/tests/blocks/block/mod.rs | 0 .../src}/tests/blocks/block/raw_delimited.rs | 0 .../src}/tests/blocks/block/section.rs | 0 .../src}/tests/blocks/block/simple.rs | 0 .../src}/tests/blocks/compound_delimited.rs | 0 {src => parser/src}/tests/blocks/macro.rs | 0 {src => parser/src}/tests/blocks/mod.rs | 0 .../src}/tests/blocks/raw_delimited.rs | 0 {src => parser/src}/tests/blocks/section.rs | 0 {src => parser/src}/tests/blocks/simple.rs | 0 .../src}/tests/document/attribute.rs | 0 .../src}/tests/document/document.rs | 0 {src => parser/src}/tests/document/header.rs | 0 {src => parser/src}/tests/document/mod.rs | 0 .../tests/fixtures/attributes/attrlist.rs | 0 .../fixtures/attributes/element_attribute.rs | 0 .../src}/tests/fixtures/attributes/mod.rs | 0 .../src}/tests/fixtures/blocks/block.rs | 0 .../fixtures/blocks/compound_delimited.rs | 0 .../src}/tests/fixtures/blocks/macro.rs | 0 .../src}/tests/fixtures/blocks/mod.rs | 0 .../tests/fixtures/blocks/raw_delimited.rs | 0 .../src}/tests/fixtures/blocks/section.rs | 0 .../src}/tests/fixtures/blocks/simple.rs | 0 .../src}/tests/fixtures/document/attribute.rs | 0 .../fixtures/document/attribute_value.rs | 0 .../src}/tests/fixtures/document/document.rs | 0 .../src}/tests/fixtures/document/header.rs | 0 .../src}/tests/fixtures/document/mod.rs | 0 .../fixtures/document/raw_attribute_value.rs | 0 .../src}/tests/fixtures/inlines/inline.rs | 0 .../src}/tests/fixtures/inlines/macro.rs | 0 .../src}/tests/fixtures/inlines/mod.rs | 0 {src => parser/src}/tests/fixtures/mod.rs | 0 {src => parser/src}/tests/fixtures/span.rs | 0 .../src}/tests/fixtures/warnings.rs | 0 {src => parser/src}/tests/inlines/inline.rs | 0 {src => parser/src}/tests/inlines/macro.rs | 0 {src => parser/src}/tests/inlines/mod.rs | 0 {src => parser/src}/tests/mod.rs | 0 {src => parser/src}/tests/sdd.rs | 0 {src => parser/src}/tests/span/discard.rs | 0 {src => parser/src}/tests/span/line.rs | 0 {src => parser/src}/tests/span/mod.rs | 0 .../src}/tests/span/parse_result.rs | 0 {src => parser/src}/tests/span/primitives.rs | 0 {src => parser/src}/tests/span/split.rs | 0 {src => parser/src}/tests/span/take.rs | 0 {src => parser/src}/tests/span/trim.rs | 0 {src => parser/src}/tests/strings.rs | 0 {src => parser/src}/tests/warnings.rs | 0 {src => parser/src}/warnings.rs | 0 release-plz.toml | 5 ++ 108 files changed, 57 insertions(+), 46 deletions(-) create mode 100644 parser/Cargo.toml rename {src => parser/src}/attributes/attrlist.rs (100%) rename {src => parser/src}/attributes/element_attribute.rs (100%) rename {src => parser/src}/attributes/mod.rs (100%) rename {src => parser/src}/blocks/block.rs (100%) rename {src => parser/src}/blocks/compound_delimited.rs (100%) rename {src => parser/src}/blocks/is_block.rs (100%) rename {src => parser/src}/blocks/macro.rs (100%) rename {src => parser/src}/blocks/mod.rs (100%) rename {src => parser/src}/blocks/parse_utils.rs (100%) rename {src => parser/src}/blocks/preamble.rs (100%) rename {src => parser/src}/blocks/raw_delimited.rs (100%) rename {src => parser/src}/blocks/section.rs (100%) rename {src => parser/src}/blocks/simple.rs (100%) rename {src => parser/src}/document/attribute.rs (100%) rename {src => parser/src}/document/document.rs (100%) rename {src => parser/src}/document/header.rs (100%) rename {src => parser/src}/document/mod.rs (100%) rename {src => parser/src}/inlines/inline.rs (100%) rename {src => parser/src}/inlines/macro.rs (100%) rename {src => parser/src}/inlines/mod.rs (100%) rename {src => parser/src}/lib.rs (100%) rename {src => parser/src}/span/discard.rs (100%) rename {src => parser/src}/span/line.rs (100%) rename {src => parser/src}/span/matched_item.rs (100%) rename {src => parser/src}/span/mod.rs (100%) rename {src => parser/src}/span/primitives.rs (100%) rename {src => parser/src}/span/slice.rs (100%) rename {src => parser/src}/span/split.rs (100%) rename {src => parser/src}/span/take.rs (100%) rename {src => parser/src}/span/trim.rs (100%) rename {src => parser/src}/strings.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/attributes/element_attributes.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/attributes/mod.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/attributes/positional_and_named_attributes.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/blocks/add_title.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/blocks/delimited.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/blocks/index.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/blocks/mod.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/mod.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/root/asciidoc_vs_markdown.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/root/document_processing.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/root/document_structure.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/root/index.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/root/key_concepts.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/root/mod.rs (100%) rename {src => parser/src}/tests/asciidoc_lang/root/normalization.rs (100%) rename {src => parser/src}/tests/attributes/attrlist.rs (100%) rename {src => parser/src}/tests/attributes/element_attribute.rs (100%) rename {src => parser/src}/tests/attributes/mod.rs (100%) rename {src => parser/src}/tests/blocks/block/compound_delimited.rs (100%) rename {src => parser/src}/tests/blocks/block/macro.rs (100%) rename {src => parser/src}/tests/blocks/block/mod.rs (100%) rename {src => parser/src}/tests/blocks/block/raw_delimited.rs (100%) rename {src => parser/src}/tests/blocks/block/section.rs (100%) rename {src => parser/src}/tests/blocks/block/simple.rs (100%) rename {src => parser/src}/tests/blocks/compound_delimited.rs (100%) rename {src => parser/src}/tests/blocks/macro.rs (100%) rename {src => parser/src}/tests/blocks/mod.rs (100%) rename {src => parser/src}/tests/blocks/raw_delimited.rs (100%) rename {src => parser/src}/tests/blocks/section.rs (100%) rename {src => parser/src}/tests/blocks/simple.rs (100%) rename {src => parser/src}/tests/document/attribute.rs (100%) rename {src => parser/src}/tests/document/document.rs (100%) rename {src => parser/src}/tests/document/header.rs (100%) rename {src => parser/src}/tests/document/mod.rs (100%) rename {src => parser/src}/tests/fixtures/attributes/attrlist.rs (100%) rename {src => parser/src}/tests/fixtures/attributes/element_attribute.rs (100%) rename {src => parser/src}/tests/fixtures/attributes/mod.rs (100%) rename {src => parser/src}/tests/fixtures/blocks/block.rs (100%) rename {src => parser/src}/tests/fixtures/blocks/compound_delimited.rs (100%) rename {src => parser/src}/tests/fixtures/blocks/macro.rs (100%) rename {src => parser/src}/tests/fixtures/blocks/mod.rs (100%) rename {src => parser/src}/tests/fixtures/blocks/raw_delimited.rs (100%) rename {src => parser/src}/tests/fixtures/blocks/section.rs (100%) rename {src => parser/src}/tests/fixtures/blocks/simple.rs (100%) rename {src => parser/src}/tests/fixtures/document/attribute.rs (100%) rename {src => parser/src}/tests/fixtures/document/attribute_value.rs (100%) rename {src => parser/src}/tests/fixtures/document/document.rs (100%) rename {src => parser/src}/tests/fixtures/document/header.rs (100%) rename {src => parser/src}/tests/fixtures/document/mod.rs (100%) rename {src => parser/src}/tests/fixtures/document/raw_attribute_value.rs (100%) rename {src => parser/src}/tests/fixtures/inlines/inline.rs (100%) rename {src => parser/src}/tests/fixtures/inlines/macro.rs (100%) rename {src => parser/src}/tests/fixtures/inlines/mod.rs (100%) rename {src => parser/src}/tests/fixtures/mod.rs (100%) rename {src => parser/src}/tests/fixtures/span.rs (100%) rename {src => parser/src}/tests/fixtures/warnings.rs (100%) rename {src => parser/src}/tests/inlines/inline.rs (100%) rename {src => parser/src}/tests/inlines/macro.rs (100%) rename {src => parser/src}/tests/inlines/mod.rs (100%) rename {src => parser/src}/tests/mod.rs (100%) rename {src => parser/src}/tests/sdd.rs (100%) rename {src => parser/src}/tests/span/discard.rs (100%) rename {src => parser/src}/tests/span/line.rs (100%) rename {src => parser/src}/tests/span/mod.rs (100%) rename {src => parser/src}/tests/span/parse_result.rs (100%) rename {src => parser/src}/tests/span/primitives.rs (100%) rename {src => parser/src}/tests/span/split.rs (100%) rename {src => parser/src}/tests/span/take.rs (100%) rename {src => parser/src}/tests/span/trim.rs (100%) rename {src => parser/src}/tests/strings.rs (100%) rename {src => parser/src}/tests/warnings.rs (100%) rename {src => parser/src}/warnings.rs (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 591f82d0..dc2f6556 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,7 +2,7 @@ version: 2 updates: - package-ecosystem: "cargo" - directory: "/" + directory: "parser" schedule: interval: "daily" commit-message: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9fbd3b5..7c1325d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: uses: taiki-e/install-action@cargo-llvm-cov - name: Generate code coverage - run: cargo llvm-cov --all-features --lcov --ignore-filename-regex tests --output-path lcov.info + run: cargo llvm-cov --workspace --all-features --lcov --ignore-filename-regex tests --output-path lcov.info # Tokens aren't available for PRs originating from forks, # so we don't attempt to upload code coverage in that case. diff --git a/Cargo.toml b/Cargo.toml index af8cb1a4..e3a7caa3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,45 +1,6 @@ -[package] -name = "asciidoc-parser" -version = "0.2.0" -description = "Parser for AsciiDoc format" -authors = ["Eric Scouten "] -license = "MIT OR Apache-2.0" -documentation = "https://docs.rs/asciidoc-parser" -repository = "https://github.com/scouten/asciidoc-parser" -readme = "README.md" -edition = "2021" -keywords = ["asciidoc", "parser"] -categories = ["parser-implementations"] -rust-version = "1.74.0" +[workspace] +resolver = "2" -[dependencies] -bytecount = "0.6.7" -memchr = "2.6.4" -thiserror = "2.0.1" - -[dev-dependencies] -codspeed-criterion-compat = "2.3.3" -criterion = "0.5.1" -pretty_assertions_sorted = "1.2.3" - -[[bench]] -name = "element_attributes" -harness = false - -[[bench]] -name = "inline_macro" -harness = false - -[[bench]] -name = "section_with_two_blocks" -harness = false - -[[bench]] -name = "simple_parse" -harness = false - -[package.metadata.cargo-udeps.ignore] -development = ["criterion"] - -[lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] } +members = [ + "parser", +] diff --git a/parser/Cargo.toml b/parser/Cargo.toml new file mode 100644 index 00000000..af8cb1a4 --- /dev/null +++ b/parser/Cargo.toml @@ -0,0 +1,45 @@ +[package] +name = "asciidoc-parser" +version = "0.2.0" +description = "Parser for AsciiDoc format" +authors = ["Eric Scouten "] +license = "MIT OR Apache-2.0" +documentation = "https://docs.rs/asciidoc-parser" +repository = "https://github.com/scouten/asciidoc-parser" +readme = "README.md" +edition = "2021" +keywords = ["asciidoc", "parser"] +categories = ["parser-implementations"] +rust-version = "1.74.0" + +[dependencies] +bytecount = "0.6.7" +memchr = "2.6.4" +thiserror = "2.0.1" + +[dev-dependencies] +codspeed-criterion-compat = "2.3.3" +criterion = "0.5.1" +pretty_assertions_sorted = "1.2.3" + +[[bench]] +name = "element_attributes" +harness = false + +[[bench]] +name = "inline_macro" +harness = false + +[[bench]] +name = "section_with_two_blocks" +harness = false + +[[bench]] +name = "simple_parse" +harness = false + +[package.metadata.cargo-udeps.ignore] +development = ["criterion"] + +[lints.rust] +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] } diff --git a/src/attributes/attrlist.rs b/parser/src/attributes/attrlist.rs similarity index 100% rename from src/attributes/attrlist.rs rename to parser/src/attributes/attrlist.rs diff --git a/src/attributes/element_attribute.rs b/parser/src/attributes/element_attribute.rs similarity index 100% rename from src/attributes/element_attribute.rs rename to parser/src/attributes/element_attribute.rs diff --git a/src/attributes/mod.rs b/parser/src/attributes/mod.rs similarity index 100% rename from src/attributes/mod.rs rename to parser/src/attributes/mod.rs diff --git a/src/blocks/block.rs b/parser/src/blocks/block.rs similarity index 100% rename from src/blocks/block.rs rename to parser/src/blocks/block.rs diff --git a/src/blocks/compound_delimited.rs b/parser/src/blocks/compound_delimited.rs similarity index 100% rename from src/blocks/compound_delimited.rs rename to parser/src/blocks/compound_delimited.rs diff --git a/src/blocks/is_block.rs b/parser/src/blocks/is_block.rs similarity index 100% rename from src/blocks/is_block.rs rename to parser/src/blocks/is_block.rs diff --git a/src/blocks/macro.rs b/parser/src/blocks/macro.rs similarity index 100% rename from src/blocks/macro.rs rename to parser/src/blocks/macro.rs diff --git a/src/blocks/mod.rs b/parser/src/blocks/mod.rs similarity index 100% rename from src/blocks/mod.rs rename to parser/src/blocks/mod.rs diff --git a/src/blocks/parse_utils.rs b/parser/src/blocks/parse_utils.rs similarity index 100% rename from src/blocks/parse_utils.rs rename to parser/src/blocks/parse_utils.rs diff --git a/src/blocks/preamble.rs b/parser/src/blocks/preamble.rs similarity index 100% rename from src/blocks/preamble.rs rename to parser/src/blocks/preamble.rs diff --git a/src/blocks/raw_delimited.rs b/parser/src/blocks/raw_delimited.rs similarity index 100% rename from src/blocks/raw_delimited.rs rename to parser/src/blocks/raw_delimited.rs diff --git a/src/blocks/section.rs b/parser/src/blocks/section.rs similarity index 100% rename from src/blocks/section.rs rename to parser/src/blocks/section.rs diff --git a/src/blocks/simple.rs b/parser/src/blocks/simple.rs similarity index 100% rename from src/blocks/simple.rs rename to parser/src/blocks/simple.rs diff --git a/src/document/attribute.rs b/parser/src/document/attribute.rs similarity index 100% rename from src/document/attribute.rs rename to parser/src/document/attribute.rs diff --git a/src/document/document.rs b/parser/src/document/document.rs similarity index 100% rename from src/document/document.rs rename to parser/src/document/document.rs diff --git a/src/document/header.rs b/parser/src/document/header.rs similarity index 100% rename from src/document/header.rs rename to parser/src/document/header.rs diff --git a/src/document/mod.rs b/parser/src/document/mod.rs similarity index 100% rename from src/document/mod.rs rename to parser/src/document/mod.rs diff --git a/src/inlines/inline.rs b/parser/src/inlines/inline.rs similarity index 100% rename from src/inlines/inline.rs rename to parser/src/inlines/inline.rs diff --git a/src/inlines/macro.rs b/parser/src/inlines/macro.rs similarity index 100% rename from src/inlines/macro.rs rename to parser/src/inlines/macro.rs diff --git a/src/inlines/mod.rs b/parser/src/inlines/mod.rs similarity index 100% rename from src/inlines/mod.rs rename to parser/src/inlines/mod.rs diff --git a/src/lib.rs b/parser/src/lib.rs similarity index 100% rename from src/lib.rs rename to parser/src/lib.rs diff --git a/src/span/discard.rs b/parser/src/span/discard.rs similarity index 100% rename from src/span/discard.rs rename to parser/src/span/discard.rs diff --git a/src/span/line.rs b/parser/src/span/line.rs similarity index 100% rename from src/span/line.rs rename to parser/src/span/line.rs diff --git a/src/span/matched_item.rs b/parser/src/span/matched_item.rs similarity index 100% rename from src/span/matched_item.rs rename to parser/src/span/matched_item.rs diff --git a/src/span/mod.rs b/parser/src/span/mod.rs similarity index 100% rename from src/span/mod.rs rename to parser/src/span/mod.rs diff --git a/src/span/primitives.rs b/parser/src/span/primitives.rs similarity index 100% rename from src/span/primitives.rs rename to parser/src/span/primitives.rs diff --git a/src/span/slice.rs b/parser/src/span/slice.rs similarity index 100% rename from src/span/slice.rs rename to parser/src/span/slice.rs diff --git a/src/span/split.rs b/parser/src/span/split.rs similarity index 100% rename from src/span/split.rs rename to parser/src/span/split.rs diff --git a/src/span/take.rs b/parser/src/span/take.rs similarity index 100% rename from src/span/take.rs rename to parser/src/span/take.rs diff --git a/src/span/trim.rs b/parser/src/span/trim.rs similarity index 100% rename from src/span/trim.rs rename to parser/src/span/trim.rs diff --git a/src/strings.rs b/parser/src/strings.rs similarity index 100% rename from src/strings.rs rename to parser/src/strings.rs diff --git a/src/tests/asciidoc_lang/attributes/element_attributes.rs b/parser/src/tests/asciidoc_lang/attributes/element_attributes.rs similarity index 100% rename from src/tests/asciidoc_lang/attributes/element_attributes.rs rename to parser/src/tests/asciidoc_lang/attributes/element_attributes.rs diff --git a/src/tests/asciidoc_lang/attributes/mod.rs b/parser/src/tests/asciidoc_lang/attributes/mod.rs similarity index 100% rename from src/tests/asciidoc_lang/attributes/mod.rs rename to parser/src/tests/asciidoc_lang/attributes/mod.rs diff --git a/src/tests/asciidoc_lang/attributes/positional_and_named_attributes.rs b/parser/src/tests/asciidoc_lang/attributes/positional_and_named_attributes.rs similarity index 100% rename from src/tests/asciidoc_lang/attributes/positional_and_named_attributes.rs rename to parser/src/tests/asciidoc_lang/attributes/positional_and_named_attributes.rs diff --git a/src/tests/asciidoc_lang/blocks/add_title.rs b/parser/src/tests/asciidoc_lang/blocks/add_title.rs similarity index 100% rename from src/tests/asciidoc_lang/blocks/add_title.rs rename to parser/src/tests/asciidoc_lang/blocks/add_title.rs diff --git a/src/tests/asciidoc_lang/blocks/delimited.rs b/parser/src/tests/asciidoc_lang/blocks/delimited.rs similarity index 100% rename from src/tests/asciidoc_lang/blocks/delimited.rs rename to parser/src/tests/asciidoc_lang/blocks/delimited.rs diff --git a/src/tests/asciidoc_lang/blocks/index.rs b/parser/src/tests/asciidoc_lang/blocks/index.rs similarity index 100% rename from src/tests/asciidoc_lang/blocks/index.rs rename to parser/src/tests/asciidoc_lang/blocks/index.rs diff --git a/src/tests/asciidoc_lang/blocks/mod.rs b/parser/src/tests/asciidoc_lang/blocks/mod.rs similarity index 100% rename from src/tests/asciidoc_lang/blocks/mod.rs rename to parser/src/tests/asciidoc_lang/blocks/mod.rs diff --git a/src/tests/asciidoc_lang/mod.rs b/parser/src/tests/asciidoc_lang/mod.rs similarity index 100% rename from src/tests/asciidoc_lang/mod.rs rename to parser/src/tests/asciidoc_lang/mod.rs diff --git a/src/tests/asciidoc_lang/root/asciidoc_vs_markdown.rs b/parser/src/tests/asciidoc_lang/root/asciidoc_vs_markdown.rs similarity index 100% rename from src/tests/asciidoc_lang/root/asciidoc_vs_markdown.rs rename to parser/src/tests/asciidoc_lang/root/asciidoc_vs_markdown.rs diff --git a/src/tests/asciidoc_lang/root/document_processing.rs b/parser/src/tests/asciidoc_lang/root/document_processing.rs similarity index 100% rename from src/tests/asciidoc_lang/root/document_processing.rs rename to parser/src/tests/asciidoc_lang/root/document_processing.rs diff --git a/src/tests/asciidoc_lang/root/document_structure.rs b/parser/src/tests/asciidoc_lang/root/document_structure.rs similarity index 100% rename from src/tests/asciidoc_lang/root/document_structure.rs rename to parser/src/tests/asciidoc_lang/root/document_structure.rs diff --git a/src/tests/asciidoc_lang/root/index.rs b/parser/src/tests/asciidoc_lang/root/index.rs similarity index 100% rename from src/tests/asciidoc_lang/root/index.rs rename to parser/src/tests/asciidoc_lang/root/index.rs diff --git a/src/tests/asciidoc_lang/root/key_concepts.rs b/parser/src/tests/asciidoc_lang/root/key_concepts.rs similarity index 100% rename from src/tests/asciidoc_lang/root/key_concepts.rs rename to parser/src/tests/asciidoc_lang/root/key_concepts.rs diff --git a/src/tests/asciidoc_lang/root/mod.rs b/parser/src/tests/asciidoc_lang/root/mod.rs similarity index 100% rename from src/tests/asciidoc_lang/root/mod.rs rename to parser/src/tests/asciidoc_lang/root/mod.rs diff --git a/src/tests/asciidoc_lang/root/normalization.rs b/parser/src/tests/asciidoc_lang/root/normalization.rs similarity index 100% rename from src/tests/asciidoc_lang/root/normalization.rs rename to parser/src/tests/asciidoc_lang/root/normalization.rs diff --git a/src/tests/attributes/attrlist.rs b/parser/src/tests/attributes/attrlist.rs similarity index 100% rename from src/tests/attributes/attrlist.rs rename to parser/src/tests/attributes/attrlist.rs diff --git a/src/tests/attributes/element_attribute.rs b/parser/src/tests/attributes/element_attribute.rs similarity index 100% rename from src/tests/attributes/element_attribute.rs rename to parser/src/tests/attributes/element_attribute.rs diff --git a/src/tests/attributes/mod.rs b/parser/src/tests/attributes/mod.rs similarity index 100% rename from src/tests/attributes/mod.rs rename to parser/src/tests/attributes/mod.rs diff --git a/src/tests/blocks/block/compound_delimited.rs b/parser/src/tests/blocks/block/compound_delimited.rs similarity index 100% rename from src/tests/blocks/block/compound_delimited.rs rename to parser/src/tests/blocks/block/compound_delimited.rs diff --git a/src/tests/blocks/block/macro.rs b/parser/src/tests/blocks/block/macro.rs similarity index 100% rename from src/tests/blocks/block/macro.rs rename to parser/src/tests/blocks/block/macro.rs diff --git a/src/tests/blocks/block/mod.rs b/parser/src/tests/blocks/block/mod.rs similarity index 100% rename from src/tests/blocks/block/mod.rs rename to parser/src/tests/blocks/block/mod.rs diff --git a/src/tests/blocks/block/raw_delimited.rs b/parser/src/tests/blocks/block/raw_delimited.rs similarity index 100% rename from src/tests/blocks/block/raw_delimited.rs rename to parser/src/tests/blocks/block/raw_delimited.rs diff --git a/src/tests/blocks/block/section.rs b/parser/src/tests/blocks/block/section.rs similarity index 100% rename from src/tests/blocks/block/section.rs rename to parser/src/tests/blocks/block/section.rs diff --git a/src/tests/blocks/block/simple.rs b/parser/src/tests/blocks/block/simple.rs similarity index 100% rename from src/tests/blocks/block/simple.rs rename to parser/src/tests/blocks/block/simple.rs diff --git a/src/tests/blocks/compound_delimited.rs b/parser/src/tests/blocks/compound_delimited.rs similarity index 100% rename from src/tests/blocks/compound_delimited.rs rename to parser/src/tests/blocks/compound_delimited.rs diff --git a/src/tests/blocks/macro.rs b/parser/src/tests/blocks/macro.rs similarity index 100% rename from src/tests/blocks/macro.rs rename to parser/src/tests/blocks/macro.rs diff --git a/src/tests/blocks/mod.rs b/parser/src/tests/blocks/mod.rs similarity index 100% rename from src/tests/blocks/mod.rs rename to parser/src/tests/blocks/mod.rs diff --git a/src/tests/blocks/raw_delimited.rs b/parser/src/tests/blocks/raw_delimited.rs similarity index 100% rename from src/tests/blocks/raw_delimited.rs rename to parser/src/tests/blocks/raw_delimited.rs diff --git a/src/tests/blocks/section.rs b/parser/src/tests/blocks/section.rs similarity index 100% rename from src/tests/blocks/section.rs rename to parser/src/tests/blocks/section.rs diff --git a/src/tests/blocks/simple.rs b/parser/src/tests/blocks/simple.rs similarity index 100% rename from src/tests/blocks/simple.rs rename to parser/src/tests/blocks/simple.rs diff --git a/src/tests/document/attribute.rs b/parser/src/tests/document/attribute.rs similarity index 100% rename from src/tests/document/attribute.rs rename to parser/src/tests/document/attribute.rs diff --git a/src/tests/document/document.rs b/parser/src/tests/document/document.rs similarity index 100% rename from src/tests/document/document.rs rename to parser/src/tests/document/document.rs diff --git a/src/tests/document/header.rs b/parser/src/tests/document/header.rs similarity index 100% rename from src/tests/document/header.rs rename to parser/src/tests/document/header.rs diff --git a/src/tests/document/mod.rs b/parser/src/tests/document/mod.rs similarity index 100% rename from src/tests/document/mod.rs rename to parser/src/tests/document/mod.rs diff --git a/src/tests/fixtures/attributes/attrlist.rs b/parser/src/tests/fixtures/attributes/attrlist.rs similarity index 100% rename from src/tests/fixtures/attributes/attrlist.rs rename to parser/src/tests/fixtures/attributes/attrlist.rs diff --git a/src/tests/fixtures/attributes/element_attribute.rs b/parser/src/tests/fixtures/attributes/element_attribute.rs similarity index 100% rename from src/tests/fixtures/attributes/element_attribute.rs rename to parser/src/tests/fixtures/attributes/element_attribute.rs diff --git a/src/tests/fixtures/attributes/mod.rs b/parser/src/tests/fixtures/attributes/mod.rs similarity index 100% rename from src/tests/fixtures/attributes/mod.rs rename to parser/src/tests/fixtures/attributes/mod.rs diff --git a/src/tests/fixtures/blocks/block.rs b/parser/src/tests/fixtures/blocks/block.rs similarity index 100% rename from src/tests/fixtures/blocks/block.rs rename to parser/src/tests/fixtures/blocks/block.rs diff --git a/src/tests/fixtures/blocks/compound_delimited.rs b/parser/src/tests/fixtures/blocks/compound_delimited.rs similarity index 100% rename from src/tests/fixtures/blocks/compound_delimited.rs rename to parser/src/tests/fixtures/blocks/compound_delimited.rs diff --git a/src/tests/fixtures/blocks/macro.rs b/parser/src/tests/fixtures/blocks/macro.rs similarity index 100% rename from src/tests/fixtures/blocks/macro.rs rename to parser/src/tests/fixtures/blocks/macro.rs diff --git a/src/tests/fixtures/blocks/mod.rs b/parser/src/tests/fixtures/blocks/mod.rs similarity index 100% rename from src/tests/fixtures/blocks/mod.rs rename to parser/src/tests/fixtures/blocks/mod.rs diff --git a/src/tests/fixtures/blocks/raw_delimited.rs b/parser/src/tests/fixtures/blocks/raw_delimited.rs similarity index 100% rename from src/tests/fixtures/blocks/raw_delimited.rs rename to parser/src/tests/fixtures/blocks/raw_delimited.rs diff --git a/src/tests/fixtures/blocks/section.rs b/parser/src/tests/fixtures/blocks/section.rs similarity index 100% rename from src/tests/fixtures/blocks/section.rs rename to parser/src/tests/fixtures/blocks/section.rs diff --git a/src/tests/fixtures/blocks/simple.rs b/parser/src/tests/fixtures/blocks/simple.rs similarity index 100% rename from src/tests/fixtures/blocks/simple.rs rename to parser/src/tests/fixtures/blocks/simple.rs diff --git a/src/tests/fixtures/document/attribute.rs b/parser/src/tests/fixtures/document/attribute.rs similarity index 100% rename from src/tests/fixtures/document/attribute.rs rename to parser/src/tests/fixtures/document/attribute.rs diff --git a/src/tests/fixtures/document/attribute_value.rs b/parser/src/tests/fixtures/document/attribute_value.rs similarity index 100% rename from src/tests/fixtures/document/attribute_value.rs rename to parser/src/tests/fixtures/document/attribute_value.rs diff --git a/src/tests/fixtures/document/document.rs b/parser/src/tests/fixtures/document/document.rs similarity index 100% rename from src/tests/fixtures/document/document.rs rename to parser/src/tests/fixtures/document/document.rs diff --git a/src/tests/fixtures/document/header.rs b/parser/src/tests/fixtures/document/header.rs similarity index 100% rename from src/tests/fixtures/document/header.rs rename to parser/src/tests/fixtures/document/header.rs diff --git a/src/tests/fixtures/document/mod.rs b/parser/src/tests/fixtures/document/mod.rs similarity index 100% rename from src/tests/fixtures/document/mod.rs rename to parser/src/tests/fixtures/document/mod.rs diff --git a/src/tests/fixtures/document/raw_attribute_value.rs b/parser/src/tests/fixtures/document/raw_attribute_value.rs similarity index 100% rename from src/tests/fixtures/document/raw_attribute_value.rs rename to parser/src/tests/fixtures/document/raw_attribute_value.rs diff --git a/src/tests/fixtures/inlines/inline.rs b/parser/src/tests/fixtures/inlines/inline.rs similarity index 100% rename from src/tests/fixtures/inlines/inline.rs rename to parser/src/tests/fixtures/inlines/inline.rs diff --git a/src/tests/fixtures/inlines/macro.rs b/parser/src/tests/fixtures/inlines/macro.rs similarity index 100% rename from src/tests/fixtures/inlines/macro.rs rename to parser/src/tests/fixtures/inlines/macro.rs diff --git a/src/tests/fixtures/inlines/mod.rs b/parser/src/tests/fixtures/inlines/mod.rs similarity index 100% rename from src/tests/fixtures/inlines/mod.rs rename to parser/src/tests/fixtures/inlines/mod.rs diff --git a/src/tests/fixtures/mod.rs b/parser/src/tests/fixtures/mod.rs similarity index 100% rename from src/tests/fixtures/mod.rs rename to parser/src/tests/fixtures/mod.rs diff --git a/src/tests/fixtures/span.rs b/parser/src/tests/fixtures/span.rs similarity index 100% rename from src/tests/fixtures/span.rs rename to parser/src/tests/fixtures/span.rs diff --git a/src/tests/fixtures/warnings.rs b/parser/src/tests/fixtures/warnings.rs similarity index 100% rename from src/tests/fixtures/warnings.rs rename to parser/src/tests/fixtures/warnings.rs diff --git a/src/tests/inlines/inline.rs b/parser/src/tests/inlines/inline.rs similarity index 100% rename from src/tests/inlines/inline.rs rename to parser/src/tests/inlines/inline.rs diff --git a/src/tests/inlines/macro.rs b/parser/src/tests/inlines/macro.rs similarity index 100% rename from src/tests/inlines/macro.rs rename to parser/src/tests/inlines/macro.rs diff --git a/src/tests/inlines/mod.rs b/parser/src/tests/inlines/mod.rs similarity index 100% rename from src/tests/inlines/mod.rs rename to parser/src/tests/inlines/mod.rs diff --git a/src/tests/mod.rs b/parser/src/tests/mod.rs similarity index 100% rename from src/tests/mod.rs rename to parser/src/tests/mod.rs diff --git a/src/tests/sdd.rs b/parser/src/tests/sdd.rs similarity index 100% rename from src/tests/sdd.rs rename to parser/src/tests/sdd.rs diff --git a/src/tests/span/discard.rs b/parser/src/tests/span/discard.rs similarity index 100% rename from src/tests/span/discard.rs rename to parser/src/tests/span/discard.rs diff --git a/src/tests/span/line.rs b/parser/src/tests/span/line.rs similarity index 100% rename from src/tests/span/line.rs rename to parser/src/tests/span/line.rs diff --git a/src/tests/span/mod.rs b/parser/src/tests/span/mod.rs similarity index 100% rename from src/tests/span/mod.rs rename to parser/src/tests/span/mod.rs diff --git a/src/tests/span/parse_result.rs b/parser/src/tests/span/parse_result.rs similarity index 100% rename from src/tests/span/parse_result.rs rename to parser/src/tests/span/parse_result.rs diff --git a/src/tests/span/primitives.rs b/parser/src/tests/span/primitives.rs similarity index 100% rename from src/tests/span/primitives.rs rename to parser/src/tests/span/primitives.rs diff --git a/src/tests/span/split.rs b/parser/src/tests/span/split.rs similarity index 100% rename from src/tests/span/split.rs rename to parser/src/tests/span/split.rs diff --git a/src/tests/span/take.rs b/parser/src/tests/span/take.rs similarity index 100% rename from src/tests/span/take.rs rename to parser/src/tests/span/take.rs diff --git a/src/tests/span/trim.rs b/parser/src/tests/span/trim.rs similarity index 100% rename from src/tests/span/trim.rs rename to parser/src/tests/span/trim.rs diff --git a/src/tests/strings.rs b/parser/src/tests/strings.rs similarity index 100% rename from src/tests/strings.rs rename to parser/src/tests/strings.rs diff --git a/src/tests/warnings.rs b/parser/src/tests/warnings.rs similarity index 100% rename from src/tests/warnings.rs rename to parser/src/tests/warnings.rs diff --git a/src/warnings.rs b/parser/src/warnings.rs similarity index 100% rename from src/warnings.rs rename to parser/src/warnings.rs diff --git a/release-plz.toml b/release-plz.toml index 27dfadaf..9b4fd596 100644 --- a/release-plz.toml +++ b/release-plz.toml @@ -38,3 +38,8 @@ features_always_increment_minor = true pr_labels = ["release"] release_always = false release_commits = "^(feat|fix|update|doc)[(:]" + +[[package]] +name = "parser" +changelog_path = "./CHANGELOG.md" + From e055c829bfcd210936baf4143e116d54e30e074b Mon Sep 17 00:00:00 2001 From: Eric Scouten Date: Sun, 5 Jan 2025 11:13:15 -0800 Subject: [PATCH 2/4] Move `benches` inside `parser` folder --- {benches => parser/benches}/element_attributes.rs | 0 {benches => parser/benches}/inline_macro.rs | 0 {benches => parser/benches}/section_with_two_blocks.rs | 0 {benches => parser/benches}/simple_parse.rs | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {benches => parser/benches}/element_attributes.rs (100%) rename {benches => parser/benches}/inline_macro.rs (100%) rename {benches => parser/benches}/section_with_two_blocks.rs (100%) rename {benches => parser/benches}/simple_parse.rs (100%) diff --git a/benches/element_attributes.rs b/parser/benches/element_attributes.rs similarity index 100% rename from benches/element_attributes.rs rename to parser/benches/element_attributes.rs diff --git a/benches/inline_macro.rs b/parser/benches/inline_macro.rs similarity index 100% rename from benches/inline_macro.rs rename to parser/benches/inline_macro.rs diff --git a/benches/section_with_two_blocks.rs b/parser/benches/section_with_two_blocks.rs similarity index 100% rename from benches/section_with_two_blocks.rs rename to parser/benches/section_with_two_blocks.rs diff --git a/benches/simple_parse.rs b/parser/benches/simple_parse.rs similarity index 100% rename from benches/simple_parse.rs rename to parser/benches/simple_parse.rs From ea5eb874091f73b0ef26c5b9a88d9898f22a93b7 Mon Sep 17 00:00:00 2001 From: Eric Scouten Date: Sun, 5 Jan 2025 11:13:48 -0800 Subject: [PATCH 3/4] Fix up reference to README --- parser/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/src/lib.rs b/parser/src/lib.rs index 8636a1d5..a558cca4 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -4,7 +4,7 @@ #![deny(clippy::unwrap_used)] #![deny(missing_docs)] #![deny(warnings)] -#![doc = include_str!("../README.md")] +#![doc = include_str!("../../README.md")] pub mod attributes; From 693f83bd4ba0193c3538314d3d2e459ada86dcff Mon Sep 17 00:00:00 2001 From: Eric Scouten Date: Sun, 5 Jan 2025 11:28:04 -0800 Subject: [PATCH 4/4] Fix up paths for README MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you to https://github.com/rust-lang/cargo/pull/11645#issuecomment-1536905941 for explaining how to do this. ❤️❤️ --- parser/Cargo.toml | 2 +- parser/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parser/Cargo.toml b/parser/Cargo.toml index af8cb1a4..e84d540f 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Eric Scouten "] license = "MIT OR Apache-2.0" documentation = "https://docs.rs/asciidoc-parser" repository = "https://github.com/scouten/asciidoc-parser" -readme = "README.md" +readme = "../README.md" edition = "2021" keywords = ["asciidoc", "parser"] categories = ["parser-implementations"] diff --git a/parser/src/lib.rs b/parser/src/lib.rs index a558cca4..ad0db4d5 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -4,7 +4,7 @@ #![deny(clippy::unwrap_used)] #![deny(missing_docs)] #![deny(warnings)] -#![doc = include_str!("../../README.md")] +#![doc = include_str!(concat!("../", std::env!("CARGO_PKG_README")))] pub mod attributes;