From 6425938c491d961b91699b1784ef463a1f574a04 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Wed, 30 Sep 2026 15:08:36 +0800 Subject: [PATCH] chore: enable comline-core's deps feature (core#6, closes the cascade) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit comline-core -> ed584ae with features = ["deps"], so `comline build`/`check` actually resolve and vendor cross-package `dependencies = {...}` (core#6, core#50). This alone diamond-mismatched against comline-codegen(-rust/ -typescript), which each still pinned the old comline-core independently — fixed by bumping all three to revs that share the new comline-core: - comline-codegen -> generation's chore/bump-core-deps-resolution branch tip (0f8dfcd), now merged as part of ComlineProject/generation#21. - comline-codegen-rust -> ComlineProject/comline-rust#12's merge (7d56cef). - comline-codegen-typescript -> ComlineProject/comline-typescript#10's merge (9af8674). Completes the cascade: core#50 -> generation#21 -> comline-rust#12 + comline-typescript#10 -> here. --- Cargo.lock | 8 ++++---- Cargo.toml | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d90376..1730ba9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=d901db42d094ea9e2f59a310e6e885767abcae6b#d901db42d094ea9e2f59a310e6e885767abcae6b" +source = "git+https://github.com/ComlineProject/generation?rev=0f8dfcd5b27f9571fd7b6bac57b314de240db707#0f8dfcd5b27f9571fd7b6bac57b314de240db707" dependencies = [ "comline-core", "eyre", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=f29f6517b9c70f488e7539219be890ef2c4151e4#f29f6517b9c70f488e7539219be890ef2c4151e4" +source = "git+https://github.com/ComlineProject/comline-rust?rev=7d56cefbdfde787a3ffdfe0b66bfaeba7ba6d500#7d56cefbdfde787a3ffdfe0b66bfaeba7ba6d500" dependencies = [ "comline-codegen", "comline-core", @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=5c20074113a748cd96b639c38c5c030c2de9fbea#5c20074113a748cd96b639c38c5c030c2de9fbea" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=9af8674291ea7f2b344be9c838d5dc9237319044#9af8674291ea7f2b344be9c838d5dc9237319044" dependencies = [ "comline-codegen", "comline-core", @@ -418,7 +418,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=50c17cc740676416e945582dd6e2547e8535ac03#50c17cc740676416e945582dd6e2547e8535ac03" +source = "git+https://github.com/ComlineProject/core?rev=ed584aef249e8a9282393d39d24f2615c9b8088a#ed584aef249e8a9282393d39d24f2615c9b8088a" dependencies = [ "ariadne", "bincode", diff --git a/Cargo.toml b/Cargo.toml index eb35c0e..11a45d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,15 +24,19 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] } serde = { version = "1", features = ["derive"] } toml = "0.8" # git rev (not crates.io) so this and the `comline-codegen*` crates share one -# `comline-core` in the tree. Local dev: see .cargo/config. -comline-core = { git = "https://github.com/ComlineProject/core", rev = "50c17cc740676416e945582dd6e2547e8535ac03" } +# `comline-core` in the tree. Local dev: see .cargo/config. `deps` is this +# crate's opt-in: cross-package `dependencies = {...}` resolution (core#6) — +# needs real I/O (git fetch, filesystem), so it's off by default for +# `comline-core`'s wasm32 consumers (the playground editor, the language +# server); the CLI is the one consumer that actually runs `comline build`. +comline-core = { git = "https://github.com/ComlineProject/core", rev = "ed584aef249e8a9282393d39d24f2615c9b8088a", features = ["deps"] } # Pinned to the same generation rev `comline-codegen-rust` / `-typescript` # pin (below) — `codegen/`'s content is identical at this rev and the later # `generation` tip (only `conformance/`, which this crate never touches, # differs), so matching it here keeps one `comline-codegen` in the tree. -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "d901db42d094ea9e2f59a310e6e885767abcae6b" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "f29f6517b9c70f488e7539219be890ef2c4151e4", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "5c20074113a748cd96b639c38c5c030c2de9fbea", optional = true } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "0f8dfcd5b27f9571fd7b6bac57b314de240db707" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "7d56cefbdfde787a3ffdfe0b66bfaeba7ba6d500", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "9af8674291ea7f2b344be9c838d5dc9237319044", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole