From a55a9c0d7bb5bfbe85c47672874f85b94e43edb4 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Tue, 6 Oct 2026 23:09:30 +0800 Subject: [PATCH] chore: bump comline-core and comline-codegen* for settings hover Step 4 (final) of the comline-core pin cascade - bumps to core's current master (settings hover + enforcement, ComlineProject/core#73), generation's post-step-1-merge codegen SHA (generation#38, matching comline-rust#27/comline-typescript#24's own pin so the CLI's build graph has one comline-codegen), and comline-rust/comline-typescript's own post-merge SHAs. Fixes the real symptom this cascade started from: `comline generate` panicking with "Assignment 'settings' is not a valid assignment" on any package with a `settings` key in config.idp, since the CLI's core pin predated the settings feature entirely. --- Cargo.lock | 10 +++++----- Cargo.toml | 23 +++++++++++------------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c41754a..912c941 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,7 +379,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=e9420c64705013ff5d507bfee3a6691e1bccf152#e9420c64705013ff5d507bfee3a6691e1bccf152" +source = "git+https://github.com/ComlineProject/generation?rev=2b5c46eefab186d24f5e883cef3fa79e4cb83ffd#2b5c46eefab186d24f5e883cef3fa79e4cb83ffd" dependencies = [ "comline-core", "eyre", @@ -388,7 +388,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=9684bd24442912cbd02451a5403166737c67bffb#9684bd24442912cbd02451a5403166737c67bffb" +source = "git+https://github.com/ComlineProject/comline-rust?rev=8844c3e8ab61cd6f3edb8c17082c93f35db6f943#8844c3e8ab61cd6f3edb8c17082c93f35db6f943" dependencies = [ "comline-codegen", "comline-core", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=e89e4c461267c8d4806be1a4ed3b71bcdb270501#e89e4c461267c8d4806be1a4ed3b71bcdb270501" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=1e934a6e98e6f447d1cfe78dc5b22dff1e491f8f#1e934a6e98e6f447d1cfe78dc5b22dff1e491f8f" dependencies = [ "comline-codegen", "comline-core", @@ -408,7 +408,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=3c9d299f6967008eec505f0950c2590a0b9ffb08#3c9d299f6967008eec505f0950c2590a0b9ffb08" +source = "git+https://github.com/ComlineProject/core?rev=6431e61a4f1073aceeaee7be7df83e6b77b2acd5#6431e61a4f1073aceeaee7be7df83e6b77b2acd5" dependencies = [ "ariadne", "bincode", @@ -439,7 +439,7 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=3c9d299f6967008eec505f0950c2590a0b9ffb08#3c9d299f6967008eec505f0950c2590a0b9ffb08" +source = "git+https://github.com/ComlineProject/core?rev=6431e61a4f1073aceeaee7be7df83e6b77b2acd5#6431e61a4f1073aceeaee7be7df83e6b77b2acd5" [[package]] name = "concolor" diff --git a/Cargo.toml b/Cargo.toml index 23d9057..f5942bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,18 +29,17 @@ 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 = "3c9d299f6967008eec505f0950c2590a0b9ffb08", features = ["deps"] } -# All three pinned to revs that already agree on comline-core@3c9d299 -# (core#71 - parse errors point at the actual unclosed bracket instead of -# spanning the whole file) - bumped together: generation#37's branch-tip -# commit (comline-rust/comline-typescript's own codegen crates consume -# `comline-codegen`'s types, so this pins the exact same generation rev -# they do - e9420c6, not generation's later merge commit, since Cargo -# only unifies a git dependency across byte-identical revs), then -# comline-rust#26 and comline-typescript#23. -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "e9420c64705013ff5d507bfee3a6691e1bccf152" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "9684bd24442912cbd02451a5403166737c67bffb", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "e89e4c461267c8d4806be1a4ed3b71bcdb270501", optional = true } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "6431e61a4f1073aceeaee7be7df83e6b77b2acd5", features = ["deps"] } +# All three pinned to revs that already agree on comline-core@6431e61 +# (core#73 - settings hover for .ids and .idp) - bumped together: +# generation#38's branch-tip commit (comline-rust/comline-typescript's own +# codegen crates consume `comline-codegen`'s types, so this pins the exact +# same generation rev they do - 2b5c46e, not generation's later merge +# commit from step 3, since Cargo only unifies a git dependency across +# byte-identical revs), then comline-rust#27 and comline-typescript#24. +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "2b5c46eefab186d24f5e883cef3fa79e4cb83ffd" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "8844c3e8ab61cd6f3edb8c17082c93f35db6f943", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "1e934a6e98e6f447d1cfe78dc5b22dff1e491f8f", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole