diff options
| author | 魏曹先生 <1992414357@qq.com> | 2026-03-31 08:54:29 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2026-03-31 08:54:29 +0800 |
| commit | 39f4f34cfdf940e1c74184edb3387ef8900ba4b4 (patch) | |
| tree | 844c865be02b23d5681d7f1ed301c36614d612d7 | |
| parent | 4421fb2794f2af292f8781e7d12ae002a3f10a9b (diff) | |
Update workspace dependencies and feature structure
- Bump mingling and mingling_macros to version 0.1.2
- Move macros from mingling_core to mingling crate
- Remove unused transitive dependencies from Cargo.lock
- Simplify tokio features in mingling_core
- Adjust feature dependencies between crates
| -rw-r--r-- | mingling/Cargo.lock | 159 | ||||
| -rw-r--r-- | mingling/Cargo.toml | 8 | ||||
| -rw-r--r-- | mingling/src/lib.rs | 13 | ||||
| -rw-r--r-- | mingling_core/Cargo.lock | 171 | ||||
| -rw-r--r-- | mingling_core/Cargo.toml | 10 | ||||
| -rw-r--r-- | mingling_core/src/lib.rs | 14 | ||||
| -rw-r--r-- | mingling_macros/Cargo.lock | 2 | ||||
| -rw-r--r-- | mingling_macros/Cargo.toml | 2 |
8 files changed, 26 insertions, 353 deletions
diff --git a/mingling/Cargo.lock b/mingling/Cargo.lock index 2f1fae9..016ed0c 100644 --- a/mingling/Cargo.lock +++ b/mingling/Cargo.lock @@ -3,60 +3,24 @@ version = 4 [[package]] -name = "bitflags" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" - -[[package]] name = "bytes" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "errno" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] name = "just_fmt" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5454cda0d57db59778608d7a47bff5b16c6705598265869fb052b657f66cf05e" [[package]] -name = "libc" -version = "0.2.183" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" - -[[package]] -name = "lock_api" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" -dependencies = [ - "scopeguard", -] - -[[package]] name = "mingling" -version = "0.1.1" +version = "0.1.2" dependencies = [ "mingling", "mingling_core", + "mingling_macros", "serde", "size", ] @@ -66,7 +30,6 @@ name = "mingling_core" version = "0.1.1" dependencies = [ "just_fmt", - "mingling_macros", "serde", "thiserror", "tokio", @@ -74,9 +37,7 @@ dependencies = [ [[package]] name = "mingling_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1f57fd20f1072939938b779684534d566d2d81104a43a32bf06a377e72bee9" +version = "0.1.2" dependencies = [ "just_fmt", "once_cell", @@ -86,46 +47,12 @@ dependencies = [ ] [[package]] -name = "mio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" -dependencies = [ - "libc", - "wasi", - "windows-sys", -] - -[[package]] name = "once_cell" version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] -name = "parking_lot" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-link", -] - -[[package]] name = "pin-project-lite" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -150,21 +77,6 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] name = "serde" version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -195,38 +107,12 @@ dependencies = [ ] [[package]] -name = "signal-hook-registry" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" -dependencies = [ - "errno", - "libc", -] - -[[package]] name = "size" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b6709c7b6754dca1311b3c73e79fcce40dd414c782c66d88e8823030093b02b" [[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "socket2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] name = "syn" version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -264,25 +150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", - "libc", - "mio", - "parking_lot", "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" -dependencies = [ - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -290,24 +158,3 @@ name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", -] diff --git a/mingling/Cargo.toml b/mingling/Cargo.toml index c9f0116..3f5d9dc 100644 --- a/mingling/Cargo.toml +++ b/mingling/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mingling" -version = "0.1.1" +version = "0.1.2" edition = "2024" authors = ["Weicao-CatilGrass"] license = "MIT OR Apache-2.0" @@ -15,13 +15,13 @@ mingling = { path = ".", features = ["full"] } [features] default = ["mingling_core/default"] -full = ["mingling_core/full", "general_renderer", "macros", "parser"] -general_renderer = ["mingling_core/general_renderer", "dep:serde"] -macros = ["mingling_core/macros"] +full = ["mingling_core/full", "general_renderer", "parser"] +general_renderer = ["mingling_core/general_renderer", "dep:serde", "mingling_macros/serde"] parser = ["dep:size"] [dependencies] mingling_core = { path = "../mingling_core", default-features = false } +mingling_macros = { path = "../mingling_macros", default-features = false } serde = { version = "1.0", features = ["derive"], optional = true } size = { version = "0.5", optional = true } diff --git a/mingling/src/lib.rs b/mingling/src/lib.rs index 19c2db9..a0efc19 100644 --- a/mingling/src/lib.rs +++ b/mingling/src/lib.rs @@ -4,3 +4,16 @@ pub use mingling_core as mingling; #[cfg(feature = "parser")] pub mod parser; + +#[allow(unused_imports)] +pub mod macros { + pub use mingling_macros::chain; + pub use mingling_macros::chain_struct; + pub use mingling_macros::dispatcher; + pub use mingling_macros::dispatcher_render; + pub use mingling_macros::node; + pub use mingling_macros::program; + pub use mingling_macros::r_print; + pub use mingling_macros::r_println; + pub use mingling_macros::renderer; +} diff --git a/mingling_core/Cargo.lock b/mingling_core/Cargo.lock index cd02598..070d244 100644 --- a/mingling_core/Cargo.lock +++ b/mingling_core/Cargo.lock @@ -3,119 +3,28 @@ version = 4 [[package]] -name = "bitflags" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" - -[[package]] name = "bytes" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "errno" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] name = "just_fmt" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5454cda0d57db59778608d7a47bff5b16c6705598265869fb052b657f66cf05e" [[package]] -name = "libc" -version = "0.2.183" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" - -[[package]] -name = "lock_api" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" -dependencies = [ - "scopeguard", -] - -[[package]] name = "mingling_core" version = "0.1.1" dependencies = [ "just_fmt", - "mingling_macros", "serde", "thiserror", "tokio", ] [[package]] -name = "mingling_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1f57fd20f1072939938b779684534d566d2d81104a43a32bf06a377e72bee9" -dependencies = [ - "just_fmt", - "once_cell", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "mio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" -dependencies = [ - "libc", - "wasi", - "windows-sys", -] - -[[package]] -name = "once_cell" -version = "1.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" - -[[package]] -name = "parking_lot" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-link", -] - -[[package]] name = "pin-project-lite" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -140,21 +49,6 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] name = "serde" version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -185,32 +79,6 @@ dependencies = [ ] [[package]] -name = "signal-hook-registry" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" -dependencies = [ - "errno", - "libc", -] - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "socket2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] name = "syn" version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -248,25 +116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", - "libc", - "mio", - "parking_lot", "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" -dependencies = [ - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -274,24 +124,3 @@ name = "unicode-ident" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", -] diff --git a/mingling_core/Cargo.toml b/mingling_core/Cargo.toml index d60c36e..c642c70 100644 --- a/mingling_core/Cargo.toml +++ b/mingling_core/Cargo.toml @@ -7,14 +7,12 @@ description = "Core of the mingling library" repository = "https://github.com/catilgrass/mingling" [features] -full = ["macros", "general_renderer"] -default = ["macros"] -macros = ["mingling_macros"] -general_renderer = ["dep:serde", "mingling_macros/serde"] +default = [] +full = ["general_renderer"] +general_renderer = ["dep:serde"] [dependencies] -mingling_macros = { version = "0.1.1", optional = true } just_fmt = "0.1.2" serde = { version = "1.0", features = ["derive"], optional = true } thiserror = "2" -tokio = { version = "1", features = ["full"] } +tokio = { version = "1", features = ["io-std", "io-util"] } diff --git a/mingling_core/src/lib.rs b/mingling_core/src/lib.rs index 4d9bcc5..10a1830 100644 --- a/mingling_core/src/lib.rs +++ b/mingling_core/src/lib.rs @@ -15,20 +15,6 @@ pub mod hint { pub use crate::program::hint::*; } -#[cfg(feature = "macros")] -#[allow(unused_imports)] -pub mod macros { - pub use mingling_macros::chain; - pub use mingling_macros::chain_struct; - pub use mingling_macros::dispatcher; - pub use mingling_macros::dispatcher_render; - pub use mingling_macros::node; - pub use mingling_macros::program; - pub use mingling_macros::r_print; - pub use mingling_macros::r_println; - pub use mingling_macros::renderer; -} - mod renderer; mod asset; diff --git a/mingling_macros/Cargo.lock b/mingling_macros/Cargo.lock index fcba9f1..3291624 100644 --- a/mingling_macros/Cargo.lock +++ b/mingling_macros/Cargo.lock @@ -10,7 +10,7 @@ checksum = "5454cda0d57db59778608d7a47bff5b16c6705598265869fb052b657f66cf05e" [[package]] name = "mingling_macros" -version = "0.1.1" +version = "0.1.2" dependencies = [ "just_fmt", "once_cell", diff --git a/mingling_macros/Cargo.toml b/mingling_macros/Cargo.toml index 1f4cb89..d8631a3 100644 --- a/mingling_macros/Cargo.toml +++ b/mingling_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mingling_macros" -version = "0.1.1" +version = "0.1.2" edition = "2024" license = "MIT OR Apache-2.0" repository = "https://github.com/catilgrass/mingling" |
