From 966965cc032986e30b461919cf99894002ffa2e8 Mon Sep 17 00:00:00 2001 From: Kinflou <149606337+Kinflou@users.noreply.github.com> Date: Fri, 13 Nov 2026 12:02:28 +0800 Subject: [PATCH 1/2] Pin core at e4c5440: datagram@1's title --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 12 ++++++------ tests/cli/generation.rs | 4 ++-- tests/fixtures/generators/Cargo.lock | 14 +++++++------- tests/fixtures/generators/Cargo.toml | 8 ++++---- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 72317f9..089f7cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -505,7 +505,7 @@ dependencies = [ [[package]] name = "comline-catalog" version = "0.11.0" -source = "git+https://github.com/ComlineProject/specification?rev=69882e92971e243b6b74a539a13b534d95b3abf7#69882e92971e243b6b74a539a13b534d95b3abf7" +source = "git+https://github.com/ComlineProject/specification?rev=6d39fc363ab3dce9d1c4876b0d414edb375e25e9#6d39fc363ab3dce9d1c4876b0d414edb375e25e9" [[package]] name = "comline-catalog" @@ -515,7 +515,7 @@ source = "git+https://github.com/ComlineProject/runtime?rev=8f8c0cb6fb0bc3a734aa [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=8e7dca84ed42f1b785fdb2470a2e94773e2fcef6#8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" +source = "git+https://github.com/ComlineProject/generation?rev=332e0f0357a67b12e335a89a3036b2cd0bf1a7be#332e0f0357a67b12e335a89a3036b2cd0bf1a7be" dependencies = [ "comline-core", "eyre", @@ -529,7 +529,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=3e6864d31fa6e933d34dde186256be6ae2ad1ff9#3e6864d31fa6e933d34dde186256be6ae2ad1ff9" +source = "git+https://github.com/ComlineProject/comline-rust?rev=2659fbf6daf6da96d320905604dc2b88a48f31d8#2659fbf6daf6da96d320905604dc2b88a48f31d8" dependencies = [ "comline-codegen", "comline-core", @@ -539,7 +539,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=b5fc2438028e6a37487993c9f86397403e4e4ff0#b5fc2438028e6a37487993c9f86397403e4e4ff0" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=ca62ea81753d799b717f27413a88fab76264b8a6#ca62ea81753d799b717f27413a88fab76264b8a6" dependencies = [ "comline-codegen", "comline-core", @@ -549,13 +549,13 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=e2d68a5fa4ee20bb50392c259f732e2d0f2300ba#e2d68a5fa4ee20bb50392c259f732e2d0f2300ba" +source = "git+https://github.com/ComlineProject/core?rev=e4c54404657337ae24c7c30ec67a781960cbd652#e4c54404657337ae24c7c30ec67a781960cbd652" dependencies = [ "ariadne", "blake3", "chumsky", "ciborium", - "comline-catalog 0.11.0 (git+https://github.com/ComlineProject/specification?rev=69882e92971e243b6b74a539a13b534d95b3abf7)", + "comline-catalog 0.11.0 (git+https://github.com/ComlineProject/specification?rev=6d39fc363ab3dce9d1c4876b0d414edb375e25e9)", "comline-core-stdlib", "downcast-rs", "eyre", @@ -579,12 +579,12 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=e2d68a5fa4ee20bb50392c259f732e2d0f2300ba#e2d68a5fa4ee20bb50392c259f732e2d0f2300ba" +source = "git+https://github.com/ComlineProject/core?rev=e4c54404657337ae24c7c30ec67a781960cbd652#e4c54404657337ae24c7c30ec67a781960cbd652" [[package]] name = "comline-doc-html" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=8e7dca84ed42f1b785fdb2470a2e94773e2fcef6#8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" +source = "git+https://github.com/ComlineProject/generation?rev=332e0f0357a67b12e335a89a3036b2cd0bf1a7be#332e0f0357a67b12e335a89a3036b2cd0bf1a7be" dependencies = [ "comline-codegen", "eyre", @@ -595,7 +595,7 @@ dependencies = [ [[package]] name = "comline-doc-markdown" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=8e7dca84ed42f1b785fdb2470a2e94773e2fcef6#8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" +source = "git+https://github.com/ComlineProject/generation?rev=332e0f0357a67b12e335a89a3036b2cd0bf1a7be#332e0f0357a67b12e335a89a3036b2cd0bf1a7be" dependencies = [ "comline-codegen", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 72cfdbb..5a5cc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,20 +32,20 @@ eyre = "0.6.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 = "e2d68a5fa4ee20bb50392c259f732e2d0f2300ba", features = ["deps"] } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "e4c54404657337ae24c7c30ec67a781960cbd652", features = ["deps"] } # All three pinned to revs that agree on one `comline-codegen`, and bumped # together: comline-rust and comline-typescript's codegen crates consume # `comline-codegen`'s types, so the rev below must be byte-identical to the # one *they* pin - Cargo only unifies a git dependency across identical rev # strings, and two copies of `GenRequest` are two incompatible types. -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } # The official Markdown and HTML documentation renderers (`comline doc`), # linked in like the official generators. Same generation rev as # `comline-codegen`. -comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" } -comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "3e6864d31fa6e933d34dde186256be6ae2ad1ff9", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "b5fc2438028e6a37487993c9f86397403e4e4ff0", optional = true } +comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } +comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "2659fbf6daf6da96d320905604dc2b88a48f31d8", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "ca62ea81753d799b717f27413a88fab76264b8a6", optional = true } # `comline conformance`: the conformance runner (corpus loading, judging, # profile proofs) and its case format, a public spec. Pinned by git rev. comline-runtime-conformance = { git = "https://github.com/ComlineProject/runtime", rev = "8f8c0cb6fb0bc3a734aafbdbbf187fb9da73e00d" } diff --git a/tests/cli/generation.rs b/tests/cli/generation.rs index 74f888f..1620a18 100644 --- a/tests/cli/generation.rs +++ b/tests/cli/generation.rs @@ -319,7 +319,7 @@ fn protocols_on_no_connection_say_why_there_is_no_package_serve() { )) // The framing's title in the catalog, and why it's lockstep. .stderr(predicate::str::contains( - "every protocol is server-provided on datagram (its frames go one way", + "every protocol is server-provided on datagram@1 (its frames go one way", )) .stderr(predicate::str::contains( "(https://comlineproject.github.io/docs/languages/rust/connections/#when-theyre-generated)", @@ -1023,7 +1023,7 @@ fn async_without_a_connection_protocol_warns() { .success() .stderr(predicate::str::contains(warning)) .stderr(predicate::str::contains( - "every protocol here is lockstep: on datagram (its frames go one way", + "every protocol here is lockstep: on datagram@1 (its frames go one way", )); // The same on JSON-RPC, whose frames don't name the protocol. diff --git a/tests/fixtures/generators/Cargo.lock b/tests/fixtures/generators/Cargo.lock index cbb0609..134e82e 100644 --- a/tests/fixtures/generators/Cargo.lock +++ b/tests/fixtures/generators/Cargo.lock @@ -79,12 +79,12 @@ dependencies = [ [[package]] name = "comline-catalog" version = "0.11.0" -source = "git+https://github.com/ComlineProject/specification?rev=69882e92971e243b6b74a539a13b534d95b3abf7#69882e92971e243b6b74a539a13b534d95b3abf7" +source = "git+https://github.com/ComlineProject/specification?rev=6d39fc363ab3dce9d1c4876b0d414edb375e25e9#6d39fc363ab3dce9d1c4876b0d414edb375e25e9" [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=8e7dca84ed42f1b785fdb2470a2e94773e2fcef6#8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" +source = "git+https://github.com/ComlineProject/generation?rev=332e0f0357a67b12e335a89a3036b2cd0bf1a7be#332e0f0357a67b12e335a89a3036b2cd0bf1a7be" dependencies = [ "comline-core", "eyre", @@ -98,7 +98,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=3e6864d31fa6e933d34dde186256be6ae2ad1ff9#3e6864d31fa6e933d34dde186256be6ae2ad1ff9" +source = "git+https://github.com/ComlineProject/comline-rust?rev=2659fbf6daf6da96d320905604dc2b88a48f31d8#2659fbf6daf6da96d320905604dc2b88a48f31d8" dependencies = [ "comline-codegen", "comline-core", @@ -108,7 +108,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=e2d68a5fa4ee20bb50392c259f732e2d0f2300ba#e2d68a5fa4ee20bb50392c259f732e2d0f2300ba" +source = "git+https://github.com/ComlineProject/core?rev=e4c54404657337ae24c7c30ec67a781960cbd652#e4c54404657337ae24c7c30ec67a781960cbd652" dependencies = [ "blake3", "ciborium", @@ -126,12 +126,12 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=e2d68a5fa4ee20bb50392c259f732e2d0f2300ba#e2d68a5fa4ee20bb50392c259f732e2d0f2300ba" +source = "git+https://github.com/ComlineProject/core?rev=e4c54404657337ae24c7c30ec67a781960cbd652#e4c54404657337ae24c7c30ec67a781960cbd652" [[package]] name = "comline-doc-html" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=8e7dca84ed42f1b785fdb2470a2e94773e2fcef6#8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" +source = "git+https://github.com/ComlineProject/generation?rev=332e0f0357a67b12e335a89a3036b2cd0bf1a7be#332e0f0357a67b12e335a89a3036b2cd0bf1a7be" dependencies = [ "comline-codegen", "eyre", @@ -142,7 +142,7 @@ dependencies = [ [[package]] name = "comline-doc-markdown" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=8e7dca84ed42f1b785fdb2470a2e94773e2fcef6#8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" +source = "git+https://github.com/ComlineProject/generation?rev=332e0f0357a67b12e335a89a3036b2cd0bf1a7be#332e0f0357a67b12e335a89a3036b2cd0bf1a7be" dependencies = [ "comline-codegen", "eyre", diff --git a/tests/fixtures/generators/Cargo.toml b/tests/fixtures/generators/Cargo.toml index 9e8604f..f3b6e9c 100644 --- a/tests/fixtures/generators/Cargo.toml +++ b/tests/fixtures/generators/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] # The same revs the CLI pins, so the real generator's output is comparable # byte for byte with the CLI's built-in one. -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" } -comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" } -comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "8e7dca84ed42f1b785fdb2470a2e94773e2fcef6" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "3e6864d31fa6e933d34dde186256be6ae2ad1ff9" } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } +comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } +comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "2659fbf6daf6da96d320905604dc2b88a48f31d8" } From 823c01a52bdeaca2d1658b324bd82acd6dbb555c Mon Sep 17 00:00:00 2001 From: Kinflou <149606337+Kinflou@users.noreply.github.com> Date: Fri, 13 Nov 2026 13:13:02 +0800 Subject: [PATCH 2/2] Pin comline-typescript at c5d80c7, #165 rebased onto main (same codegen) --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 089f7cf..98cdcc6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -539,7 +539,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=ca62ea81753d799b717f27413a88fab76264b8a6#ca62ea81753d799b717f27413a88fab76264b8a6" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=c5d80c772631de17b03c0b039321887707a80e4d#c5d80c772631de17b03c0b039321887707a80e4d" dependencies = [ "comline-codegen", "comline-core", diff --git a/Cargo.toml b/Cargo.toml index 5a5cc30..242195e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = comline-doc-markdown = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } comline-doc-html = { git = "https://github.com/ComlineProject/generation", rev = "332e0f0357a67b12e335a89a3036b2cd0bf1a7be" } comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "2659fbf6daf6da96d320905604dc2b88a48f31d8", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "ca62ea81753d799b717f27413a88fab76264b8a6", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "c5d80c772631de17b03c0b039321887707a80e4d", optional = true } # `comline conformance`: the conformance runner (corpus loading, judging, # profile proofs) and its case format, a public spec. Pinned by git rev. comline-runtime-conformance = { git = "https://github.com/ComlineProject/runtime", rev = "8f8c0cb6fb0bc3a734aafbdbbf187fb9da73e00d" }