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
8 changes: 4 additions & 4 deletions codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ license = "GPL-3.0-only"
# repository structure — no crates.io publishing at this stage). Pinned to the
# same generation rev `comline-typescript` uses, so a CLI build has one
# `comline-codegen`. Local iteration: add a `[patch]` onto a sibling checkout.
comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "e22109e1a6ca3c8e5a63338e2fe9acda44123ee1" }
comline-core = { git = "https://github.com/ComlineProject/core", rev = "14ce54658455206d639ddc4fbe6d609d20292587", default-features = false }
comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "6253d0c58115e862341cd1e7b650be41e8faaf4a" }
comline-core = { git = "https://github.com/ComlineProject/core", rev = "69039e7ab05953760bb7a6818f61e98c14b43922", default-features = false }

eyre = "0.6.8"

Expand All @@ -24,6 +24,6 @@ path = "src/bin/comline-gen-rust.rs"
# The conformance corpus: every fixture is a whole package. Same generation
# rev as `comline-codegen` above, so the corpus and the generator share one
# `comline-codegen`.
comline-conformance = { git = "https://github.com/ComlineProject/generation", rev = "e22109e1a6ca3c8e5a63338e2fe9acda44123ee1" }
comline-conformance = { git = "https://github.com/ComlineProject/generation", rev = "6253d0c58115e862341cd1e7b650be41e8faaf4a" }
# The tests compile schemas, so they need core's compiler.
comline-core = { git = "https://github.com/ComlineProject/core", rev = "14ce54658455206d639ddc4fbe6d609d20292587" }
comline-core = { git = "https://github.com/ComlineProject/core", rev = "69039e7ab05953760bb7a6818f61e98c14b43922" }
50 changes: 50 additions & 0 deletions codegen/tests/wire_invariants.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,20 @@ src/lib.rs: HELLO = 0x43, 0x4f, 0x02, 0x01, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89,
src/lib.rs: const PROTOCOLS: &[(u16, &str)] = &[(0, "conformance::Chat")];
src/lib.rs: check_call(protocol, function
CONNECTION_IR_HASH = 0x9328a48fb76a93df
== lockstep (code)
conformance.rs: IR_HASH = 0x7ea94b595fcf4393
conformance.rs: const MAIL_CALLS: &[&str] = &["send_message", "fetch_inbox"];
conformance.rs: reply.err(0u16
conformance.rs: Call::new(0, "send_message"
conformance.rs: Envelope::Err { id: 0u16
conformance.rs: Call::new(1, "fetch_inbox"
== lockstep (lib)
src/conformance.rs: IR_HASH = 0x7ea94b595fcf4393
src/conformance.rs: const MAIL_CALLS: &[&str] = &["send_message", "fetch_inbox"];
src/conformance.rs: reply.err(0u16
src/conformance.rs: Call::new(0, "send_message"
src/conformance.rs: Envelope::Err { id: 0u16
src/conformance.rs: Call::new(1, "fetch_inbox"
== connections (code)
conformance.rs: IR_HASH = 0xb97e34b203ec1425
conformance.rs: const CHAT_CALLS: &[&str] = &["send"];
Expand Down Expand Up @@ -238,6 +252,42 @@ src/conformance.rs: const PROTOCOL: ProtocolNumber = 1;
src/conformance.rs: Call::new(0, "conformance.Events/shown"
src/conformance.rs: Call::new(1, "conformance.Events/ping"
CONNECTION_IR_HASH = 0x30c29bde2ae397d9
== connections_default (code)
conformance.rs: IR_HASH = 0x1ad273c98d4e98fb
conformance.rs: const CHAT_CALLS: &[&str] = &["send"];
conformance.rs: const PROTOCOL: ProtocolNumber = 0;
conformance.rs: const PROTOCOL: ProtocolNumber = 0;
conformance.rs: check_call(&mut *self.0, Self::PROTOCOL, 0, "conformance::Chat", "send"
conformance.rs: Call::new(0, "send"
conformance.rs: const EVENTS_CALLS: &[&str] = &["shown", "ping"];
conformance.rs: const PROTOCOL: ProtocolNumber = 1;
conformance.rs: const PROTOCOL: ProtocolNumber = 1;
conformance.rs: check_call(&mut *self.0, Self::PROTOCOL, 1, "conformance::Events", "shown"
conformance.rs: Call::new(1, "shown"
conformance.rs: check_call(&mut *self.0, Self::PROTOCOL, 0, "conformance::Events", "ping"
conformance.rs: Call::new(0, "ping"
connection.rs: HELLO = 0x43, 0x4f, 0x02, 0x01, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd,0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x00, 0x01, 0x00,0x00, 0x03, 0x00, 0x52, 0x18, 0x5f, 0xd6, 0x09, 0x92, 0xad, 0x43, 0x02,0x9c, 0xc2, 0x99, 0x62, 0xb3, 0xaf, 0xb4, 0x01, 0x4e, 0x6e, 0xde, 0x7c,0xc8, 0xf5, 0xaa, 0x52, 0xce, 0x16, 0x9f, 0x9e, 0x65, 0x67, 0x40, 0xe2,0x02, 0x58, 0x80, 0x9a, 0xaf, 0x4b, 0x47, 0xd5, 0x6c, 0x69, 0xb2, 0xc1,0xfc, 0x9d, 0x43, 0x30, 0xc1, 0x02, 0x00, 0x00, 0x01, 0x00, 0x5a, 0x5a,0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a,0x5a, 0x5a, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x5a, 0x5a, 0x5a, 0x5a,0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a,0x02, 0x00, 0x01,
connection.rs: const PROTOCOLS: &[(u16, &str)] = &[(0, "conformance::Chat"), (1, "conformance::Events")];
connection.rs: check_call(protocol, function
CONNECTION_IR_HASH = 0x1ad273c98d4e98fb
== connections_default (lib)
src/conformance.rs: IR_HASH = 0x1ad273c98d4e98fb
src/conformance.rs: const CHAT_CALLS: &[&str] = &["send"];
src/conformance.rs: const PROTOCOL: ProtocolNumber = 0;
src/conformance.rs: const PROTOCOL: ProtocolNumber = 0;
src/conformance.rs: check_call(&mut *self.0, Self::PROTOCOL, 0, "conformance::Chat", "send"
src/conformance.rs: Call::new(0, "send"
src/conformance.rs: const EVENTS_CALLS: &[&str] = &["shown", "ping"];
src/conformance.rs: const PROTOCOL: ProtocolNumber = 1;
src/conformance.rs: const PROTOCOL: ProtocolNumber = 1;
src/conformance.rs: check_call(&mut *self.0, Self::PROTOCOL, 1, "conformance::Events", "shown"
src/conformance.rs: Call::new(1, "shown"
src/conformance.rs: check_call(&mut *self.0, Self::PROTOCOL, 0, "conformance::Events", "ping"
src/conformance.rs: Call::new(0, "ping"
src/lib.rs: HELLO = 0x43, 0x4f, 0x02, 0x01, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd,0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x00, 0x01, 0x00,0x00, 0x03, 0x00, 0x52, 0x18, 0x5f, 0xd6, 0x09, 0x92, 0xad, 0x43, 0x02,0x9c, 0xc2, 0x99, 0x62, 0xb3, 0xaf, 0xb4, 0x01, 0x4e, 0x6e, 0xde, 0x7c,0xc8, 0xf5, 0xaa, 0x52, 0xce, 0x16, 0x9f, 0x9e, 0x65, 0x67, 0x40, 0xe2,0x02, 0x58, 0x80, 0x9a, 0xaf, 0x4b, 0x47, 0xd5, 0x6c, 0x69, 0xb2, 0xc1,0xfc, 0x9d, 0x43, 0x30, 0xc1, 0x02, 0x00, 0x00, 0x01, 0x00, 0x5a, 0x5a,0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a,0x5a, 0x5a, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x5a, 0x5a, 0x5a, 0x5a,0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a,0x02, 0x00, 0x01,
src/lib.rs: const PROTOCOLS: &[(u16, &str)] = &[(0, "conformance::Chat"), (1, "conformance::Events")];
src/lib.rs: check_call(protocol, function
CONNECTION_IR_HASH = 0x1ad273c98d4e98fb
== format_json (code)
conformance.rs: IR_HASH = 0x8ee00745c73a32b2
conformance.rs: const SERVICE_CALLS: &[&str] = &["lookup", "count", "notify"];
Expand Down
4 changes: 2 additions & 2 deletions xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ publish = false
[dependencies]
# Same rev `codegen` pins, so this tool and the generator it drives agree on
# one `comline-core` - see codegen/Cargo.toml's own comment.
comline-core = { git = "https://github.com/ComlineProject/core", rev = "14ce54658455206d639ddc4fbe6d609d20292587" }
comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "e22109e1a6ca3c8e5a63338e2fe9acda44123ee1" }
comline-core = { git = "https://github.com/ComlineProject/core", rev = "69039e7ab05953760bb7a6818f61e98c14b43922" }
comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "6253d0c58115e862341cd1e7b650be41e8faaf4a" }
comline-codegen-rust = { path = "../codegen" }

eyre = "0.6.8"
Loading