From 3d327d731ccdec46e9ef550777b4e3a130e11f69 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Sun, 18 Oct 2026 09:16:03 +0800 Subject: [PATCH] chore: bump core to 1245d12 (string only, validator targets) Test fixtures and inline schemas move from `str` to `string`. --- Cargo.lock | 10 +++++----- Cargo.toml | 8 ++++---- tests/cli/add.rs | 4 ++-- tests/cli/check.rs | 2 +- tests/fixtures/chat_project/src/chat.ids | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6612378..a11aebe 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=ee1859e54e64b394b5b1000ed77094bda667d628#ee1859e54e64b394b5b1000ed77094bda667d628" +source = "git+https://github.com/ComlineProject/generation?rev=e6e7249d64fb63206f6a4cb2b7678b0010bce34b#e6e7249d64fb63206f6a4cb2b7678b0010bce34b" 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=c4ad89373b2b7bea06d22d6839e1babffce5f3a4#c4ad89373b2b7bea06d22d6839e1babffce5f3a4" +source = "git+https://github.com/ComlineProject/comline-rust?rev=742ffcca0c7dc34f37d5d5fe734ea6f3893fec40#742ffcca0c7dc34f37d5d5fe734ea6f3893fec40" 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=c2efda439c16c1180007810ef95ef98143c0c82a#c2efda439c16c1180007810ef95ef98143c0c82a" +source = "git+https://github.com/ComlineProject/comline-typescript?rev=f66641e31226c91965138ee79954ebad113091f9#f66641e31226c91965138ee79954ebad113091f9" 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=c2d61b0c375c280235614e3238eb9bb0a716689d#c2d61b0c375c280235614e3238eb9bb0a716689d" +source = "git+https://github.com/ComlineProject/core?rev=1245d12f7fe3a5ae11329621e80d27b6d72eed97#1245d12f7fe3a5ae11329621e80d27b6d72eed97" 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=c2d61b0c375c280235614e3238eb9bb0a716689d#c2d61b0c375c280235614e3238eb9bb0a716689d" +source = "git+https://github.com/ComlineProject/core?rev=1245d12f7fe3a5ae11329621e80d27b6d72eed97#1245d12f7fe3a5ae11329621e80d27b6d72eed97" [[package]] name = "concolor" diff --git a/Cargo.toml b/Cargo.toml index c1e1f3e..94d7615 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,15 +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 = "c2d61b0c375c280235614e3238eb9bb0a716689d", features = ["deps"] } +comline-core = { git = "https://github.com/ComlineProject/core", rev = "1245d12f7fe3a5ae11329621e80d27b6d72eed97", 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 = "ee1859e54e64b394b5b1000ed77094bda667d628" } -comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "c4ad89373b2b7bea06d22d6839e1babffce5f3a4", optional = true } -comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "c2efda439c16c1180007810ef95ef98143c0c82a", optional = true } +comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "e6e7249d64fb63206f6a4cb2b7678b0010bce34b" } +comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "742ffcca0c7dc34f37d5d5fe734ea6f3893fec40", optional = true } +comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "f66641e31226c91965138ee79954ebad113091f9", optional = true } [features] # Which language generators are compiled in. Drop one to shed its whole diff --git a/tests/cli/add.rs b/tests/cli/add.rs index 3679e56..bcebc35 100644 --- a/tests/cli/add.rs +++ b/tests/cli/add.rs @@ -70,7 +70,7 @@ fn adds_a_path_dependency_pinned_and_importable() { // The pin catches a change to the dependency. fs::write( temp.path().join("shared/src/models.ids"), - "struct Thing {\n id: u64\n name: str\n}\n", + "struct Thing {\n id: u64\n name: string\n}\n", ) .unwrap(); check(&project) @@ -95,7 +95,7 @@ fn no_hash_leaves_it_unpinned() { .contains("hash =")); fs::write( temp.path().join("shared/src/models.ids"), - "struct Thing {\n id: u64\n name: str\n}\n", + "struct Thing {\n id: u64\n name: string\n}\n", ) .unwrap(); uses_thing_from(&project, "shared"); diff --git a/tests/cli/check.rs b/tests/cli/check.rs index 9011db0..b9e5a02 100644 --- a/tests/cli/check.rs +++ b/tests/cli/check.rs @@ -102,7 +102,7 @@ fn std_is_usable_and_checked() { let project = fixture_project(temp.path()); fs::write( project.join("src/exchange.ids"), - "use std::http::{Request, Response}\nuse std::validators::StringBounds\n\nstruct Exchange {\n request: Request\n response: Response\n @validators = [StringBounds(min_chars = 1)]\n label: str\n}\n", + "use std::http::{Request, Response}\nuse std::validators::StringBounds\n\nstruct Exchange {\n request: Request\n response: Response\n @validators = [StringBounds(min_chars = 1)]\n label: string\n}\n", ) .unwrap(); diff --git a/tests/fixtures/chat_project/src/chat.ids b/tests/fixtures/chat_project/src/chat.ids index db4484f..a45049b 100644 --- a/tests/fixtures/chat_project/src/chat.ids +++ b/tests/fixtures/chat_project/src/chat.ids @@ -1,11 +1,11 @@ struct Message { - body: str + body: string seq: u64 } error Rejected { message = "rejected: {self.reason}" - reason: str + reason: string } error TooLong { @@ -15,7 +15,7 @@ error TooLong { protocol Chat { /// Request/response with a struct return, raising either of two errors. - function send(text: str) -> Message ! Rejected, TooLong; + function send(text: string) -> Message ! Rejected, TooLong; /// Fire-and-forget. - function note(text: str); + function note(text: string); }