Refactor workspace move rstml to separate folder.

Use workspace version of dependencies whenever is possible.
rs-tml · Jul 28, 2024 · 5517e8e · 5517e8e
1 parent e5b7f3c
commit 5517e8e
Show file tree

Hide file tree

Showing 26 changed files with 148 additions and 59 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -12,7 +12,7 @@ jobs:
       - name: critcmp
         run: |
           cargo install critcmp
-          cargo bench -- --save-baseline changes
+          cargo bench -p rstml --bench bench changes
           git checkout main
-          cargo bench -- --save-baseline main
+          cargo bench -p rstml --bench bench main
           critcmp main changes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,63 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.11.2] - 2023-08-14
+## [0.12.0] - 2024-07-28
+
+### Chore
+
+- Fix ci
+- Fix clippy
+- Add example of custom node to html-to-string-macro.
+- Add eq and partial eq implementation.
+- Move custom node implementation to separate crate.
+- Refactor CustomNode trait
+- Add readme to rstml-controll-flow
+- Refine visitor api (remove clone/debug bounds)
+- Add custom node visitor implementation
+- Apply fmt/tests
+- Refactor custom node visitor.
+- Refactor code coverage script.
+
+### Features
+
+- Support for custom node
+- Parsing utilities for custom nodes
+- Add macro matcher
+- Add visitor api.
+- Implement extendable custom node
+
+### Fix
+
+- Fix imports in example
+- Empty input parsing
+- Make Recoverable field public.
+- Fix spelling mistake "witespace" to "whitespace"
+- Add unquoted text custom node integration
+- Use config and diagnostc from invalid_block in attribute place.
+
+### Other
+
+- Use example from inline docs in readme
+- Address review
+
+- Allow multiple puncts in a row in NodeName
+- Added test for consecutive punctuation in NodeName
+
+Signed-off-by: max <[email protected]>
+
+- Update README.md
+- Default impl for Parser ([#51](https://github.com/rs-tml/rstml/issues/51))
+
+- Initial implementation of block attributes
+
+- Implement braced key value attribute. See also: [#54](https://github.com/rs-tml/rstml/issues/54#issuecomment-2247924159)
+
+- Remove scratch
+
+- Rename KVAttributeValue::Braced -> KVAttributeValue::InvalidBraced
+
+
+## [0.11.1] - 2023-08-14
 
 ### Chore
 
@@ -502,4 +558,4 @@ Use RecoverableContext instead.
 - Pub not needed
 - Parse blocks as NodeType::Block
 
-<!-- generated by git-cliff -->
+<!-- generated by git-cliff -->
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,20 +1,24 @@
-[package]
-name = "rstml"
+[workspace.package]
 description = "Rust templating for XML-based formats (HTML, SVG, MathML) implemented on top of proc-macro::TokenStreams"
-version = "0.11.2"
 authors = ["vldm <[email protected]>", "stoically <[email protected]>"]
 keywords = ["syn", "jsx", "rsx", "html", "macro"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/rs-tml/rstml"
-readme = "README.md"
 license = "MIT"
-resolver = "2"
+license-file = "LICENSE"
+
 include = ["/src", "LICENSE"]
+readme = "README.md"
 
-[lib]
-bench = false
+[workspace]
+resolver = "2"
+members = ["examples/html-to-string-macro", "rstml-control-flow"]
 
-[dependencies]
+[workspace.dependencies]
+# Our packages
+rstml = { version = "0.12.0", path = "rstml" }
+rstml-control-flow = { version = "0.1.0", path = "rstml-control-flow" }
+# external dependencies
 proc-macro2 = { version = "1.0.47", features = ["span-locations"] }
 quote = "1.0.21"
 syn = { version = "2.0.15", features = [
@@ -27,26 +31,7 @@ thiserror = "1.0.37"
 syn_derive = "0.1.6"
 proc-macro2-diagnostics = { version = "0.10", default-features = false }
 derive-where = "1.2.5"
-
-[dev-dependencies]
-proc-macro2 = { version = "1.0.47", features = ["span-locations"] }
+# dev-dependencies
 criterion = "0.5.1"
 eyre = "0.6.8"
-
-[[bench]]
-name = "bench"
-harness = false
-path = "benches/bench.rs"
-
-[workspace]
-members = ["examples/html-to-string-macro", "rstml-control-flow"]
-
-[features]
-default = ["colors"]
-# Hack that parse input two times, using `proc-macro2::fallback` to recover spaces, and persist original spans.
-# It has no penalty in nightly, but in stable it parses input two times.
-# In order to use this feature, one should also set `ParserConfig::macro_call_pattern`.
-rawtext-stable-hack = ["rawtext-stable-hack-module"]
-# Export inters of rawtext_stable_hack. It is usefull if you need support of `UnquotedText` on stable but your macro is called from other one.
-rawtext-stable-hack-module = []
-colors = ["proc-macro2-diagnostics/colors"]
+trybuild = "1.0"
diff --git a/examples/html-to-string-macro/Cargo.toml b/examples/html-to-string-macro/Cargo.toml
@@ -2,27 +2,26 @@
 name = "rstml-to-string-macro"
 description = "simple html to string macro powered by rstml"
 version = "0.1.0"
-authors = ["vldm <[email protected]>", "stoically <[email protected]>"]
-keywords = ["html-to-string", "html", "macro"]
-edition = "2021"
-repository = "https://github.com/rs-tml/rstml/tree/main/examples/html-to-string-macro"
-readme = "README.md"
-license = "MIT"
+authors.workspace = true
+keywords.workspace = true
+edition.workspace = true
+repository.workspace = true
+readme.workspace = true
+license.workspace = true
+include.workspace = true
 
 [lib]
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "1.0.47"
-quote = "1.0.21"
-syn = "2.0.15"
-syn_derive = "0.1"
-rstml = { version = "0.11.0", path = "../../", features = [
-    "rawtext-stable-hack",
-] }
-proc-macro2-diagnostics = "0.10"
-derive-where = "1.2.5"
-rstml-control-flow = { version = "0.1.0", path = "../../rstml-control-flow" }
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+syn_derive.workspace = true
+rstml = { workspace = true, features = ["rawtext-stable-hack"] }
+proc-macro2-diagnostics.workspace = true
+derive-where.workspace = true
+rstml-control-flow.workspace = true
 
 [dev-dependencies]
-trybuild = "1.0"
+trybuild.workspace = true
diff --git a/rstml-control-flow/Cargo.toml b/rstml-control-flow/Cargo.toml
@@ -1,18 +1,24 @@
 [package]
 name = "rstml-control-flow"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+authors.workspace = true
+keywords.workspace = true
+repository.workspace = true
+readme.workspace = true
+license.workspace = true
+include.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-proc-macro2 = "1.0.47"
-quote = "1.0.21"
-syn = "2.0.15"
-syn_derive = "0.1"
-rstml = { version = "0.11.0", path = "../", features = ["rawtext-stable-hack"] }
-proc-macro2-diagnostics = "0.10"
-derive-where = "1.2.5"
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+syn_derive.workspace = true
+proc-macro2-diagnostics.workspace = true
+derive-where.workspace = true
+rstml = { workspace = true, features = ["rawtext-stable-hack"] }
 
 [features]
 default = []

diff --git a/rstml/Cargo.toml b/rstml/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "rstml"
+description.workspace = true
+version = "0.12.0"
+authors.workspace = true
+keywords.workspace = true
+edition.workspace = true
+repository.workspace = true
+readme.workspace = true
+license.workspace = true
+include.workspace = true
+[lib]
+bench = false
+
+[dependencies]
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+thiserror.workspace = true
+syn_derive.workspace = true
+proc-macro2-diagnostics.workspace = true
+derive-where.workspace = true
+
+[dev-dependencies]
+proc-macro2 = { workspace = true, features = ["span-locations"] }
+criterion.workspace = true
+eyre.workspace = true
+
+[[bench]]
+name = "bench"
+harness = false
+path = "benches/bench.rs"
+
+
+[features]
+default = ["colors"]
+# Hack that parse input two times, using `proc-macro2::fallback` to recover spaces, and persist original spans.
+# It has no penalty in nightly, but in stable it parses input two times.
+# In order to use this feature, one should also set `ParserConfig::macro_call_pattern`.
+rawtext-stable-hack = ["rawtext-stable-hack-module"]
+# Export inters of rawtext_stable_hack. It is usefull if you need support of `UnquotedText` on stable but your macro is called from other one.
+rawtext-stable-hack-module = []
+colors = ["proc-macro2-diagnostics/colors"]
diff --git a/benches/bench.rs → rstml/benches/bench.rs b/benches/bench.rs → rstml/benches/bench.rs
diff --git a/build.rs → rstml/build.rs b/build.rs → rstml/build.rs
diff --git a/src/config.rs → rstml/src/config.rs b/src/config.rs → rstml/src/config.rs
diff --git a/src/error.rs → rstml/src/error.rs b/src/error.rs → rstml/src/error.rs
diff --git a/src/lib.rs → rstml/src/lib.rs b/src/lib.rs → rstml/src/lib.rs
diff --git a/src/node/atoms.rs → rstml/src/node/atoms.rs b/src/node/atoms.rs → rstml/src/node/atoms.rs
diff --git a/src/node/attribute.rs → rstml/src/node/attribute.rs b/src/node/attribute.rs → rstml/src/node/attribute.rs
diff --git a/src/node/mod.rs → rstml/src/node/mod.rs b/src/node/mod.rs → rstml/src/node/mod.rs
diff --git a/src/node/node_name.rs → rstml/src/node/node_name.rs b/src/node/node_name.rs → rstml/src/node/node_name.rs
diff --git a/src/node/node_value.rs → rstml/src/node/node_value.rs b/src/node/node_value.rs → rstml/src/node/node_value.rs
diff --git a/src/node/parse.rs → rstml/src/node/parse.rs b/src/node/parse.rs → rstml/src/node/parse.rs
diff --git a/src/node/parser_ext.rs → rstml/src/node/parser_ext.rs b/src/node/parser_ext.rs → rstml/src/node/parser_ext.rs
diff --git a/src/node/raw_text.rs → rstml/src/node/raw_text.rs b/src/node/raw_text.rs → rstml/src/node/raw_text.rs
diff --git a/src/parser/mod.rs → rstml/src/parser/mod.rs b/src/parser/mod.rs → rstml/src/parser/mod.rs
diff --git a/src/parser/recoverable.rs → rstml/src/parser/recoverable.rs b/src/parser/recoverable.rs → rstml/src/parser/recoverable.rs
diff --git a/src/rawtext_stable_hack.rs → rstml/src/rawtext_stable_hack.rs b/src/rawtext_stable_hack.rs → rstml/src/rawtext_stable_hack.rs
diff --git a/src/visitor.rs → rstml/src/visitor.rs b/src/visitor.rs → rstml/src/visitor.rs
diff --git a/tests/custom_node.rs → rstml/tests/custom_node.rs b/tests/custom_node.rs → rstml/tests/custom_node.rs
diff --git a/tests/recoverable_parser.rs → rstml/tests/recoverable_parser.rs b/tests/recoverable_parser.rs → rstml/tests/recoverable_parser.rs
diff --git a/tests/test.rs → rstml/tests/test.rs b/tests/test.rs → rstml/tests/test.rs