From 552f68f54212dd388fdf97d8d5d4c848e68b6c68 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Sun, 1 Nov 2026 22:43:16 +0800 Subject: [PATCH 1/2] deps: changelog entries as highlighted IDL lines in comline doc comline-core on core#162's branch (changelog entries carry old/new IDL lines), the generation crates on generation#103's (the renderers show them, plus a theme toggle), and the generators on their matching pin bumps. Generated code is byte-identical. --- Cargo.lock | 14 +++++++------- Cargo.toml | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5dff58d..8378894 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -564,7 +564,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=6889d3db79ab20f7091d309071ea0b41e2ed5317#6889d3db79ab20f7091d309071ea0b41e2ed5317" +source = "git+https://github.com/ComlineProject/generation?rev=b11de98bf16e1fad0105301220920d33d1f2de98#b11de98bf16e1fad0105301220920d33d1f2de98" dependencies = [ "comline-core", "eyre", @@ -578,7 +578,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=0e39319a80be086f6dbee1a3a017eab0662925b6#0e39319a80be086f6dbee1a3a017eab0662925b6" +source = "git+https://github.com/ComlineProject/comline-rust?rev=ffc7d032c2592e381370c43c47912a0eb0766e45#ffc7d032c2592e381370c43c47912a0eb0766e45" dependencies = [ "comline-codegen", "comline-core", @@ -588,7 +588,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=ad8756847518e6af281c46d1d0e441fdb46e9dde#ad8756847518e6af281c46d1d0e441fdb46e9dde" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=43a4a095a26ec9b8fb7a053e158149ac391881f3#43a4a095a26ec9b8fb7a053e158149ac391881f3" dependencies = [ "comline-codegen", "comline-core", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=525939352b79538ce5e9b41ae6713ee6bd26a25e#525939352b79538ce5e9b41ae6713ee6bd26a25e" +source = "git+https://github.com/ComlineProject/core?rev=4e882b468bc0e29172fb5e558f4e5db5c5b0fc65#4e882b468bc0e29172fb5e558f4e5db5c5b0fc65" dependencies = [ "ariadne", "blake3", @@ -627,12 +627,12 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=525939352b79538ce5e9b41ae6713ee6bd26a25e#525939352b79538ce5e9b41ae6713ee6bd26a25e" +source = "git+https://github.com/ComlineProject/core?rev=4e882b468bc0e29172fb5e558f4e5db5c5b0fc65#4e882b468bc0e29172fb5e558f4e5db5c5b0fc65" [[package]] name = "comline-doc-html" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=6889d3db79ab20f7091d309071ea0b41e2ed5317#6889d3db79ab20f7091d309071ea0b41e2ed5317" +source = "git+https://github.com/ComlineProject/generation?rev=b11de98bf16e1fad0105301220920d33d1f2de98#b11de98bf16e1fad0105301220920d33d1f2de98" dependencies = [ "comline-codegen", "eyre", @@ -643,7 +643,7 @@ dependencies = [ [[package]] name = "comline-doc-markdown" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=6889d3db79ab20f7091d309071ea0b41e2ed5317#6889d3db79ab20f7091d309071ea0b41e2ed5317" +source = "git+https://github.com/ComlineProject/generation?rev=b11de98bf16e1fad0105301220920d33d1f2de98#b11de98bf16e1fad0105301220920d33d1f2de98" dependencies = [ "comline-codegen", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 02a4145..eb60528 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 = "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/ComlineProject/core", rev = "525939352b79538ce5e9b41ae6713ee6bd26a25e", features = ["deps"] } +comline-core = { git = "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/ComlineProject/core", rev = "4e882b468bc0e29172fb5e558f4e5db5c5b0fc65", 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 = "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/ComlineProject/generation", rev = "6889d3db79ab20f7091d309071ea0b41e2ed5317" } +comline-codegen = { git = "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/ComlineProject/generation", rev = "b11de98bf16e1fad0105301220920d33d1f2de98" } # 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 = "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/ComlineProject/generation", rev = "6889d3db79ab20f7091d309071ea0b41e2ed5317" } -comline-doc-html = { git = "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/ComlineProject/generation", rev = "6889d3db79ab20f7091d309071ea0b41e2ed5317" } -comline-codegen-rust = { git = "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/ComlineProject/comline-rust", rev = "0e39319a80be086f6dbee1a3a017eab0662925b6", optional = true } -comline-codegen-typescript = { git = "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/ComlineProject/comline-typescript", rev = "ad8756847518e6af281c46d1d0e441fdb46e9dde", optional = true } +comline-doc-markdown = { git = "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/ComlineProject/generation", rev = "b11de98bf16e1fad0105301220920d33d1f2de98" } +comline-doc-html = { git = "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/ComlineProject/generation", rev = "b11de98bf16e1fad0105301220920d33d1f2de98" } +comline-codegen-rust = { git = "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/ComlineProject/comline-rust", rev = "ffc7d032c2592e381370c43c47912a0eb0766e45", optional = true } +comline-codegen-typescript = { git = "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/ComlineProject/comline-typescript", rev = "43a4a095a26ec9b8fb7a053e158149ac391881f3", 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 = "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/ComlineProject/runtime", rev = "4378c91b74ee1ef1debc800a3daf75c874198e70" } From 2313bad7197f65494bed6c2431485de5f76feffc Mon Sep 17 00:00:00 2001 From: Kinflou Date: Sun, 1 Nov 2026 22:51:11 +0800 Subject: [PATCH 2/2] tests: the generators fixture on the same pins; the changelog assertion on entries The external-renderer fixture builds the official renderers itself, so it pins the same generation, comline-rust and core revs. The doc test checks the entry's subject and its diff block rather than the old field dump. --- tests/cli/doc.rs | 4 +++- tests/fixtures/generators/Cargo.lock | 12 ++++++------ tests/fixtures/generators/Cargo.toml | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/cli/doc.rs b/tests/cli/doc.rs index f25e04e..d726363 100644 --- a/tests/cli/doc.rs +++ b/tests/cli/doc.rs @@ -113,7 +113,9 @@ fn documents_a_built_version_with_its_frozen_headers_and_a_changelog() { changelog.contains("## 0.1.0-dev.1 to 0.1.0-dev.2"), "{changelog}" ); - assert!(changelog.contains("field name: `note`"), "{changelog}"); + // The entry names the field, then shows its new IDL line. + assert!(changelog.contains(".note`"), "{changelog}"); + assert!(changelog.contains("```diff\n+"), "{changelog}"); } #[test] diff --git a/tests/fixtures/generators/Cargo.lock b/tests/fixtures/generators/Cargo.lock index d5d0296..796dba7 100644 --- a/tests/fixtures/generators/Cargo.lock +++ b/tests/fixtures/generators/Cargo.lock @@ -79,7 +79,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=6889d3db79ab20f7091d309071ea0b41e2ed5317#6889d3db79ab20f7091d309071ea0b41e2ed5317" +source = "git+https://github.com/ComlineProject/generation?rev=b11de98bf16e1fad0105301220920d33d1f2de98#b11de98bf16e1fad0105301220920d33d1f2de98" dependencies = [ "comline-core", "eyre", @@ -93,7 +93,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=0e39319a80be086f6dbee1a3a017eab0662925b6#0e39319a80be086f6dbee1a3a017eab0662925b6" +source = "git+https://github.com/ComlineProject/comline-rust?rev=ffc7d032c2592e381370c43c47912a0eb0766e45#ffc7d032c2592e381370c43c47912a0eb0766e45" dependencies = [ "comline-codegen", "comline-core", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=525939352b79538ce5e9b41ae6713ee6bd26a25e#525939352b79538ce5e9b41ae6713ee6bd26a25e" +source = "git+https://github.com/ComlineProject/core?rev=4e882b468bc0e29172fb5e558f4e5db5c5b0fc65#4e882b468bc0e29172fb5e558f4e5db5c5b0fc65" dependencies = [ "blake3", "ciborium", @@ -120,12 +120,12 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=525939352b79538ce5e9b41ae6713ee6bd26a25e#525939352b79538ce5e9b41ae6713ee6bd26a25e" +source = "git+https://github.com/ComlineProject/core?rev=4e882b468bc0e29172fb5e558f4e5db5c5b0fc65#4e882b468bc0e29172fb5e558f4e5db5c5b0fc65" [[package]] name = "comline-doc-html" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=6889d3db79ab20f7091d309071ea0b41e2ed5317#6889d3db79ab20f7091d309071ea0b41e2ed5317" +source = "git+https://github.com/ComlineProject/generation?rev=b11de98bf16e1fad0105301220920d33d1f2de98#b11de98bf16e1fad0105301220920d33d1f2de98" dependencies = [ "comline-codegen", "eyre", @@ -136,7 +136,7 @@ dependencies = [ [[package]] name = "comline-doc-markdown" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=6889d3db79ab20f7091d309071ea0b41e2ed5317#6889d3db79ab20f7091d309071ea0b41e2ed5317" +source = "git+https://github.com/ComlineProject/generation?rev=b11de98bf16e1fad0105301220920d33d1f2de98#b11de98bf16e1fad0105301220920d33d1f2de98" dependencies = [ "comline-codegen", "eyre", diff --git a/tests/fixtures/generators/Cargo.toml b/tests/fixtures/generators/Cargo.toml index 40a38f1..c311152 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 = "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/ComlineProject/generation", rev = "6889d3db79ab20f7091d309071ea0b41e2ed5317" } -comline-doc-markdown = { git = "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/ComlineProject/generation", rev = "6889d3db79ab20f7091d309071ea0b41e2ed5317" } -comline-doc-html = { git = "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/ComlineProject/generation", rev = "6889d3db79ab20f7091d309071ea0b41e2ed5317" } -comline-codegen-rust = { git = "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/ComlineProject/comline-rust", rev = "0e39319a80be086f6dbee1a3a017eab0662925b6" } +comline-codegen = { git = "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/ComlineProject/generation", rev = "b11de98bf16e1fad0105301220920d33d1f2de98" } +comline-doc-markdown = { git = "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/ComlineProject/generation", rev = "b11de98bf16e1fad0105301220920d33d1f2de98" } +comline-doc-html = { git = "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/ComlineProject/generation", rev = "b11de98bf16e1fad0105301220920d33d1f2de98" } +comline-codegen-rust = { git = "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/ComlineProject/comline-rust", rev = "ffc7d032c2592e381370c43c47912a0eb0766e45" }