From 3259e3fa97ff1f00e6219ea933050651e0bd70b0 Mon Sep 17 00:00:00 2001 From: Kinflou <149606337+Kinflou@users.noreply.github.com> Date: Sun, 4 Oct 2026 10:52:43 +0000 Subject: [PATCH] chore: bump comline-core and the codegen crates for unresolved-import rejection Moves comline-core to a4e810f, so `comline check` / `build` reject a `use` that matches nothing (core#59, with a "did you mean"), and also pick up core#58's `package::` rename and self/parent resolution fix and core#57's vocabulary module. comline-codegen, comline-codegen-rust and comline-codegen-typescript move together to revs on the same core (generation#30, comline-rust#18, comline-typescript#16). comline-codegen is pinned to the generation commit the two generators pin, not generation#30's later commit, so the tree keeps one comline-codegen. --- Cargo.lock | 8 ++++---- Cargo.toml | 19 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 339825c..ff6a6bf 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=c8572c0a3b1588c43724b411fc8babe20ceb27c4#c8572c0a3b1588c43724b411fc8babe20ceb27c4" +source = "git+https://github.com/ComlineProject/generation?rev=7f094cfdd65cacf29b8a963d31e0231a4b16f0a6#7f094cfdd65cacf29b8a963d31e0231a4b16f0a6" 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=80723a2b19d628e1c02881df1bb39c966d9f4d7a#80723a2b19d628e1c02881df1bb39c966d9f4d7a" +source = "git+https://github.com/ComlineProject/comline-rust?rev=58e718b48897a735abf5b55586419d820e4490d9#58e718b48897a735abf5b55586419d820e4490d9" 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=2d267650933d3a0f968115d7504d03eb4012902d#2d267650933d3a0f968115d7504d03eb4012902d" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=e21d51e0b34f1e1db1400f8cdc55b2b483afc32e#e21d51e0b34f1e1db1400f8cdc55b2b483afc32e" 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=c9c1e7079b89a7ef6ba0c5d9ec1477d8f1129952#c9c1e7079b89a7ef6ba0c5d9ec1477d8f1129952" +source = "git+https://github.com/ComlineProject/core?rev=a4e810f3b85c715189a4310d389c1f612150cd7d#a4e810f3b85c715189a4310d389c1f612150cd7d" dependencies = [ "ariadne", "bincode", diff --git a/Cargo.toml b/Cargo.toml index a48df28..665b732 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,16 +29,15 @@ toml = "0.8" # 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 = "c9c1e7079b89a7ef6ba0c5d9ec1477d8f1129952", features = ["deps"] } -# All three pinned to revs that already agree on comline-core@c9c1e70 (a -# bare `@key` marker annotation, no `=value` required, core#56) — bumped -# together, in dependency order: generation#28 first (comline-rust/ -# comline-typescript's own codegen crates consume `comline-codegen`'s -# types, so they can't bump ahead of it), then comline-rust#17 and -# comline-typescript#15. -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "c8572c0a3b1588c43724b411fc8babe20ceb27c4" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "80723a2b19d628e1c02881df1bb39c966d9f4d7a", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "2d267650933d3a0f968115d7504d03eb4012902d", optional = true } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "a4e810f3b85c715189a4310d389c1f612150cd7d", features = ["deps"] } +# All three pinned to revs that already agree on comline-core@a4e810f +# (unresolved imports rejected, core#59) — bumped together: generation#30's +# first commit (comline-rust/comline-typescript's own codegen crates consume +# `comline-codegen`'s types, so this pins the same generation rev they do, +# not a later one), then comline-rust#18 and comline-typescript#16. +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "7f094cfdd65cacf29b8a963d31e0231a4b16f0a6" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "58e718b48897a735abf5b55586419d820e4490d9", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "e21d51e0b34f1e1db1400f8cdc55b2b483afc32e", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole