From 4e5ccf2a0d61337dd8faecdb245bb685bf139398 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Tue, 13 Oct 2026 00:33:40 +0800 Subject: [PATCH] chore: bump comline-core and the generators for duplicate-declaration spans Step 4 of the cascade. Nothing in `cli` constructs a `FrozenUnit::Error`, so this is pins only - but it is what makes `comline build` report a duplicate declaration at both sites, with both kinds named, the same way the editor now does. --- Cargo.lock | 10 +++++----- Cargo.toml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2dee436..4449cda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -397,7 +397,7 @@ dependencies = [ [[package]] name = "comline-codegen" version = "0.1.0" -source = "git+https://github.com/ComlineProject/generation?rev=db290d659801d4bf674a224ee70a0026bb9d9c5b#db290d659801d4bf674a224ee70a0026bb9d9c5b" +source = "git+https://github.com/ComlineProject/generation?rev=52803df6436f49aec5f2266a94c89d4ced4b229c#52803df6436f49aec5f2266a94c89d4ced4b229c" dependencies = [ "comline-core", "eyre", @@ -406,7 +406,7 @@ dependencies = [ [[package]] name = "comline-codegen-rust" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-rust?rev=a98c973740248b1e03101a4fef29d4ac190e4fad#a98c973740248b1e03101a4fef29d4ac190e4fad" +source = "git+https://github.com/ComlineProject/comline-rust?rev=eb8396a337e0efe452cea32cdb0e6a50dd56f2d5#eb8396a337e0efe452cea32cdb0e6a50dd56f2d5" dependencies = [ "comline-codegen", "comline-core", @@ -416,7 +416,7 @@ dependencies = [ [[package]] name = "comline-codegen-typescript" version = "0.1.0" -source = "git+https://github.com/ComlineProject/comline-typescript?rev=a24b4154aba36fac6d5c910ee6dfe89e7573013e#a24b4154aba36fac6d5c910ee6dfe89e7573013e" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=d8a1df17b83752314a34d9c0b7817e4feb16820e#d8a1df17b83752314a34d9c0b7817e4feb16820e" dependencies = [ "comline-codegen", "comline-core", @@ -426,7 +426,7 @@ dependencies = [ [[package]] name = "comline-core" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=338a707854e1b25450a9a438c039250382aae6fd#338a707854e1b25450a9a438c039250382aae6fd" +source = "git+https://github.com/ComlineProject/core?rev=5c1f3474b462ed912f4f2f5a518b87a5f6576aaa#5c1f3474b462ed912f4f2f5a518b87a5f6576aaa" dependencies = [ "ariadne", "blake3", @@ -455,7 +455,7 @@ dependencies = [ [[package]] name = "comline-core-stdlib" version = "0.1.0" -source = "git+https://github.com/ComlineProject/core?rev=338a707854e1b25450a9a438c039250382aae6fd#338a707854e1b25450a9a438c039250382aae6fd" +source = "git+https://github.com/ComlineProject/core?rev=5c1f3474b462ed912f4f2f5a518b87a5f6576aaa#5c1f3474b462ed912f4f2f5a518b87a5f6576aaa" [[package]] name = "concolor" diff --git a/Cargo.toml b/Cargo.toml index 1e41942..305d20c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ 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 = "338a707854e1b25450a9a438c039250382aae6fd", features = ["deps"] } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "5c1f3474b462ed912f4f2f5a518b87a5f6576aaa", features = ["deps"] } # All three pinned to revs that agree on one `comline-codegen` - bumped # together: generation#40's branch-tip commit (GenRequest.external_std - # comline-rust/comline-typescript's own codegen crates consume @@ -37,9 +37,9 @@ comline-core = { git = "https://github.com/ComlineProject/core", rev = "338a7078 # they do, since Cargo only unifies a git dependency across byte-identical # revs), then comline-rust#30 and comline-typescript#25 (both branch-tip, # pending those PRs' merge). -comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "db290d659801d4bf674a224ee70a0026bb9d9c5b" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "a98c973740248b1e03101a4fef29d4ac190e4fad", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "a24b4154aba36fac6d5c910ee6dfe89e7573013e", optional = true } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "52803df6436f49aec5f2266a94c89d4ced4b229c" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "eb8396a337e0efe452cea32cdb0e6a50dd56f2d5", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "d8a1df17b83752314a34d9c0b7817e4feb16820e", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole