Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/cli/add.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
8 changes: 4 additions & 4 deletions tests/fixtures/chat_project/src/chat.ids
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
struct Message {
body: str
body: string
seq: u64
}

error Rejected {
message = "rejected: {self.reason}"
reason: str
reason: string
}

error TooLong {
Expand All @@ -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);
}
Loading