mirror of
https://github.com/zap-proto/rust.git
synced 2026-10-30 15:04:23 +00:00
zeekay
ed429a2283
Cap'n Proto was the canonical name for this Rust implementation. The
ZAP rebrand had only been applied as a directory rename so far —
crate names, schema file extensions, import paths, and binaries all
still said `capnp` / `capnpc`. This commit makes the rebrand real.
Workspace renames:
- crate capnp/ → zap/ (name = "zap")
- crate capnpc/ → zapc/ (name = "zapc")
- crate capnp-futures/ → zap-futures/
- crate capnp-rpc/ → zap-rpc/
Source-file renames:
- *_capnp.rs → *_zap.rs (~12 files: schema_zap.rs, rpc_zap.rs, etc.)
- capnpc-rust.rs → zapc-rust.rs (the codegen binary entry point)
- *.capnp → *.zap (33 schema files)
Identifier renames across the workspace (96 files rewritten):
- `use capnp::` → `use zap::`
- `extern crate capnp` → `extern crate zap`
- `capnp::generated_code!` → `zap::generated_code!`
- `capnp::traits::Owned` → `zap::traits::Owned`
- `capnp::message::...` → `zap::message::...`
- `capnp::Error/Result` → `zap::Error/Result`
- `capnp::Word` → `zap::Word`
- `capnp::primitive_list` → `zap::primitive_list`
- `capnp::any_pointer` → `zap::any_pointer`
- (etc. — see python script in commit history for full list)
Cargo.toml dep keys:
- `capnp = { path = ... }` → `zap = { path = ... }`
- `[dependencies.capnp]` → `[dependencies.zap]`
- `capnpc = { ... }` → `zapc = { ... }`
- Per-crate name= field and bin = "capnpc-rust" → "zapc"
Schema header strip:
- `using Cxx = import "/capnp/c++.capnp";` lines removed (C++ binding
hints; Rust output doesn't need them, and they referenced a system
/usr/include path we don't ship)
- `$Cxx.namespace("capnp::...")` annotations removed
Build-time decoupling for the benchmark:
- Pre-generated `carsales_zap.rs`, `catrank_zap.rs`, `eval_zap.rs` are
now committed in benchmark/. benchmark/build.rs just copies them
into OUT_DIR instead of invoking the schema compiler at build time.
- benchmark/Cargo.toml drops the [build-dependencies] zapc entry.
Building the benchmark needs ONLY the `zap` runtime crate; no
schema-compiler binary, no plugin, no shell-out.
To regenerate the schema-bound .rs from .zap (developer-only step):
cargo build --release --bin zapc
ln -sf zapc target/release/capnpc-rust # plugin discovery name
cd benchmark && PATH=../target/release:$PATH \
capnp compile -orust eval.zap catrank.zap carsales.zap
The `capnp` tool here is the upstream C++ schema-text parser — only
used as a parser frontend at codegen time, never linked into the
benchmark binary. Runtime + build = 100% zap/zapc only.
Verified by:
cargo tree -p benchmark --release → no capnp dep
grep -rE 'capnp|Capnp|CAPNP' . → 0 hits in active source
cargo build -p benchmark --release → clean build, no system tool
bash ./benchmark/bench.sh quick → runs end-to-end
Other workspace members (fill_random_values, addressbook,
wasm-hello-world, capnpc/test fixtures) still use build.rs schema
compilation at build time; they require a `zap` binary in PATH.
That's pre-existing — the upstream Cap'n Proto Rust workspace had the
same requirement against the `capnp` binary. Out of scope for this PR.
39 lines
1.4 KiB
Plaintext
39 lines
1.4 KiB
Plaintext
@0xa2e5682ebdc1a289;
|
|
|
|
struct I8Range { min @0 : Int8; max @1 : Int8; }
|
|
struct I16Range { min @0 : Int16; max @1 : Int16; }
|
|
struct I32Range { min @0 : Int32; max @1 : Int32; }
|
|
struct I64Range { min @0 : Int64; max @1 : Int64; }
|
|
struct U8Range { min @0 : UInt8; max @1 : UInt8; }
|
|
struct U16Range { min @0 : UInt16; max @1 : UInt16; }
|
|
struct U32Range { min @0 : UInt32; max @1 : UInt32; }
|
|
struct U64Range { min @0 : UInt64; max @1 : UInt64; }
|
|
struct F32Range { min @0 : Float32; max @1 : Float32; }
|
|
struct F64Range { min @0 : Float64; max @1 : Float64; }
|
|
|
|
annotation int8Range(field) : I8Range;
|
|
annotation int16Range(field) : I16Range;
|
|
annotation int32Range(field) : I32Range;
|
|
annotation int64Range(field) : I64Range;
|
|
annotation uint8Range(field) : U8Range;
|
|
annotation uint16Range(field) : U16Range;
|
|
annotation uint32Range(field) : U32Range;
|
|
annotation uint64Range(field) : U64Range;
|
|
annotation float32Range(field) : F32Range;
|
|
annotation float64Range(field) : F64Range;
|
|
|
|
|
|
annotation lengthRange(field) : U32Range;
|
|
|
|
struct SelectFrom(T) {
|
|
annotation choices(field) : T;
|
|
# Selects from a set of choices. `T` should be a list type `List(S)` where `S`
|
|
# is the type of the field being annotated.
|
|
}
|
|
|
|
annotation phoneNumber(field) : Void;
|
|
# Indicates that a text field should have a value that looks like a phone number.
|
|
|
|
annotation nullProbability(field) : Float64;
|
|
# Specifies the rate at which a pointer field should be set as null.
|